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

Commit 3cef96ff authored by kaiyiz's avatar kaiyiz Committed by Gerrit - the friendly Code Review server
Browse files

Settings: Fix menu item display incorrect in Account 

ContentResolver.getCurrentSyncsAsUser() is empty,syncActive is true.

ContentResolver.getCurrentSyncsAsUser() is empty,syncActive should be false.

CRs-Fixed: 744816

Change-Id: I2df061595c3d67c442d62a13cb92ac6f706b58ee
parent fb8b07b2

src/com/android/settings/accounts/AccountSyncSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { 
    public void onPrepareOptionsMenu(Menu menu) {

        super.onPrepareOptionsMenu(menu);

        // Note that this also counts accounts that are not currently displayed

        boolean syncActive = ContentResolver.getCurrentSyncsAsUser(

        boolean syncActive = !ContentResolver.getCurrentSyncsAsUser(

                mUserHandle.getIdentifier()).isEmpty();

        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);

        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);

src/com/android/settings/accounts/ManageAccountsSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase 
    @Override

    public void onPrepareOptionsMenu(Menu menu) {

        super.onPrepareOptionsMenu(menu);

        boolean syncActive = ContentResolver.getCurrentSyncsAsUser(

        boolean syncActive = !ContentResolver.getCurrentSyncsAsUser(

                mUserHandle.getIdentifier()).isEmpty();

        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive && mFirstAccount != null);

        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive && mFirstAccount != null);