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

Commit d6462710 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Fix menu item display incorrect in Account"

parents fb8b07b2 3cef96ff

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

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

    public void onPrepareOptionsMenu(Menu menu) {

        super.onPrepareOptionsMenu(menu);

        super.onPrepareOptionsMenu(menu);

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

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

        boolean syncActive = ContentResolver.getCurrentSyncsAsUser(

        boolean syncActive = !ContentResolver.getCurrentSyncsAsUser(

                mUserHandle.getIdentifier()).isEmpty();

                mUserHandle.getIdentifier()).isEmpty();

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

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

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

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

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

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

    @Override

    public void onPrepareOptionsMenu(Menu menu) {

    public void onPrepareOptionsMenu(Menu menu) {

        super.onPrepareOptionsMenu(menu);

        super.onPrepareOptionsMenu(menu);

        boolean syncActive = ContentResolver.getCurrentSyncsAsUser(

        boolean syncActive = !ContentResolver.getCurrentSyncsAsUser(

                mUserHandle.getIdentifier()).isEmpty();

                mUserHandle.getIdentifier()).isEmpty();

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

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

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

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