commit 5831d1de22daee9ca9915efad358fedfd0846379
author Xi Chen <samchen@google.com> Sat Jul 30 19:40:31 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 30 19:40:31 2016 +0000
tree 9534fa42f435494c97c7567ee7768cb49ec54a1a
parent 981d0b124446b653e4392da62cc55a7d52bc75c4
parent 1d6320d88f7c897e1250774cab8dfbace13fbd0f

Merge "Selection mode still has pullToRefresh feature"

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

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index b0a0ad1..6a8f0c7 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -187,7 +187,7 @@
 
     // Update sync status for accounts in current ContactListFilter
     private void onSyncStateUpdated() {
-        if (mActionBarAdapter.isSearchMode()) {
+        if (mActionBarAdapter.isSearchMode() || mActionBarAdapter.isSelectionMode()) {
             return;
         }
 
@@ -1515,7 +1515,8 @@
         swipeRefreshLayout.setRefreshing(false);
         swipeRefreshLayout.setEnabled(false);
 
-        if (filter != null && !mActionBarAdapter.isSearchMode()) {
+        if (filter != null && !mActionBarAdapter.isSearchMode()
+                && !mActionBarAdapter.isSelectionMode()) {
             final List<AccountWithDataSet> accounts = AccountTypeManager.getInstance(this)
                     .getAccounts(/* contactsWritableOnly */ true);
             if (filter.isSyncable(accounts)) {