commit f2b7bf31d2f4a71e8e37e48aefe84fe2ea8948be
author Wenyi Wang <wenyiw@google.com> Sun Oct 02 17:52:18 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Oct 02 17:52:19 2016 +0000
tree 13b9c30cbfc10746796264f91a641e2f621fc3a7
parent 30d5dec74532caca718e6ac022ed415c73938d4d
parent 72b0f455878e1296fdb57d72449af73f84e34f1b

Merge "Set directory search mode earlier"

src/com/android/contacts/common/list/DirectoryListLoader.java

diff --git a/src/com/android/contacts/common/list/DirectoryListLoader.java b/src/com/android/contacts/common/list/DirectoryListLoader.java
index c45a3ca..13d0f92 100644
--- a/src/com/android/contacts/common/list/DirectoryListLoader.java
+++ b/src/com/android/contacts/common/list/DirectoryListLoader.java
@@ -199,11 +199,13 @@
             mDefaultDirectoryList.addRow(new Object[] {
                     Directory.DEFAULT,
                     getContext().getString(R.string.contactsList),
+                    null,
                     null
             });
             mDefaultDirectoryList.addRow(new Object[] {
                     Directory.LOCAL_INVISIBLE,
                     getContext().getString(R.string.local_invisible_directory),
+                    null,
                     null
             });
         }

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 3c0acf6..a336e09 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -511,6 +511,8 @@
         if (savedInstanceState != null && savedInstanceState.getBoolean(KEY_DELETION_IN_PROGRESS)) {
             deleteSelectedContacts();
         }
+
+        setDirectorySearchMode();
     }
 
     public void initializeActionBarAdapter(Bundle savedInstanceState) {
@@ -576,7 +578,9 @@
 
         setQueryString(mActionBarAdapter.getQueryString(), true);
         setVisibleScrollbarEnabled(!isSearchMode());
+    }
 
+    private void setDirectorySearchMode() {
         if (mContactsRequest.isDirectorySearchEnabled()) {
             setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DEFAULT);
         } else {