commit 1799e6d97db667826309acdd265da98972608121
author Dmitri Plotnikov <dplotnikov@google.com> Thu Sep 16 15:51:17 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Thu Sep 16 15:51:17 2010 -0700
tree 4dae4378fabf452cd42f102ee3e0215fb76582b0
parent e843f916942fff482ec162eee2a23914e32182cf

Disabling list filter in search mode

Change-Id: If80933f5a7b6c1e4930045696bbcec8fab55083c

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

diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index db04020..dd23455 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -393,6 +393,7 @@
                 fragment.setAizyEnabled(!mRequest.isSearchMode());
                 fragment.setSelectionVisible(mContactContentDisplayed);
                 fragment.setQuickContactEnabled(!mContactContentDisplayed);
+                fragment.setFilterEnabled(!mRequest.isSearchMode());
                 return fragment;
             }
 

src/com/android/contacts/list/DefaultContactBrowseListFragment.java

diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 7e3fb0e..c8c6d2b 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -52,8 +52,6 @@
     private static final String KEY_DISPLAY_WITH_PHONES_ONLY = "displayWithPhonesOnly";
     private static final String KEY_VISIBLE_CONTACTS_RESTRICTION = "visibleContactsRestriction";
 
-    private static final int GROUP_FILTER_LOADER = -4;
-
     private static final int REQUEST_CODE_CUSTOMIZE_FILTER = 3;
 
     private boolean mEditMode;
@@ -62,7 +60,7 @@
     private boolean mVisibleContactsRestrictionEnabled = true;
     private View mHeaderView;
 
-    private boolean mFilterEnabled = true;
+    private boolean mFilterEnabled;
     private SparseArray<ContactListFilter> mFilters;
     private ArrayList<ContactListFilter> mFilterList;
     private int mNextFilterId = 1;
@@ -252,6 +250,14 @@
         mEditMode = flag;
     }
 
+    public boolean isFilterEnabled() {
+        return mFilterEnabled;
+    }
+
+    public void setFilterEnabled(boolean flag) {
+        this.mFilterEnabled = flag;
+    }
+
     public boolean isCreateContactEnabled() {
         return mCreateContactEnabled;
     }