commit fde48de9ab7f1fb6e2037a32437e4f70716c719b
author Brian Attwell <brianattwell@google.com> Fri Nov 21 11:01:31 2014 -0800
committer Brian Attwell <brianattwell@google.com> Fri Nov 21 19:14:14 2014 +0000
tree 3928e3f44698d3e0e655fa2f179c480f34f86083
parent b6fe3a1abf25110034e512d5428abf7486ec8f55

Don't show search when unsupported

Bug: 18472894
Bug: 18418543
Change-Id: I95a6046d36e89b4c877a07f4b39142b95f434e4d

src/com/android/contacts/activities/ContactSelectionActivity.java

diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 7bfdf5b..53f685c 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -83,6 +83,7 @@
 
     private int mActionCode = -1;
     private boolean mIsSearchMode;
+    private boolean mIsSearchSupported;
 
     private ContactsRequest mRequest;
     private SearchView mSearchView;
@@ -153,6 +154,8 @@
                 actionBar.setDisplayHomeAsUpEnabled(true);
                 actionBar.setDisplayShowTitleEnabled(true);
             }
+            mIsSearchSupported = false;
+            configureSearchMode();
             return;
         }
 
@@ -174,6 +177,7 @@
                 new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
         actionBar.setDisplayShowCustomEnabled(true);
 
+        mIsSearchSupported = true;
         configureSearchMode();
     }
 
@@ -660,7 +664,7 @@
         inflater.inflate(R.menu.search_menu, menu);
 
         final MenuItem searchItem = menu.findItem(R.id.menu_search);
-        searchItem.setVisible(!mIsSearchMode);
+        searchItem.setVisible(!mIsSearchMode && mIsSearchSupported);
         return true;
     }