commit ebc9443dad6391f9f04af4805e13adebca148a1b
author Alexandre Savard <alexandre.savard@savoirfairelinux.com> Thu Sep 13 14:30:55 2012 -0400
committer Alexandre Savard <alexandre.savard@savoirfairelinux.com> Thu Sep 13 14:30:55 2012 -0400
tree efbacdc3992e73ef9ccb89ae3661f99b217355fa
parent e621e67385b2e5f27581d56db2b1e8384ddf46c3

#15570: Make sure pressing search button does not launch preference activity

src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java

diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
index 1908862..c699f45 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
+++ b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
@@ -170,13 +170,15 @@
 
         @Override
         public boolean onOptionsItemSelected(MenuItem item) {
-            Log.i("SFLphone", "onOptionsItemSelected");
+            Log.i("SFLphone", "onOptionsItemSelected " + item.getItemId());
 
-            // When the button is clicked, launch an activity through this intent
-            Intent launchPreferencesIntent = new Intent().setClass(this, SFLPhonePreferenceActivity.class);
+            if(item.getItemId() != 0) {
+                // When the button is clicked, launch an activity through this intent
+                Intent launchPreferencesIntent = new Intent().setClass(this, SFLPhonePreferenceActivity.class);
 
-            // Make it a subactivity so we know when it returns
-            startActivityForResult(launchPreferencesIntent, REQUEST_CODE_PREFERENCES);
+                // Make it a subactivity so we know when it returns
+                startActivityForResult(launchPreferencesIntent, REQUEST_CODE_PREFERENCES);
+            }
 
             return super.onOptionsItemSelected(item);
         }