Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5831d1de authored by Xi Chen's avatar Xi Chen Committed by Android (Google) Code Review
Browse files

Merge "Selection mode still has pullToRefresh feature"

parents 981d0b12 1d6320d8

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

+3 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ public class PeopleActivity extends ContactsDrawerActivity implements 


    // Update sync status for accounts in current ContactListFilter

    private void onSyncStateUpdated() {

        if (mActionBarAdapter.isSearchMode()) {

        if (mActionBarAdapter.isSearchMode() || mActionBarAdapter.isSelectionMode()) {

            return;

        }
@@ -1515,7 +1515,8 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
        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)) {