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

Commit 981e9a96 authored by Tony Mak's avatar Tony Mak
Browse files

Disable instead of hiding add account preference 

Bug: 29236399
Change-Id: Ieb1af7f31a54b1502ae99682fc423e37c86a2353
parent 2c5a27dc

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

+4 −2
Original line number Diff line number Diff line
@@ -316,9 +316,11 @@ public class AccountSettings extends SettingsPreferenceFragment 
        if (userInfo.isEnabled()) {

            profileData.authenticatorHelper = new AuthenticatorHelper(context,

                    userInfo.getUserHandle(), this);

            if (!RestrictedLockUtils.hasBaseUserRestriction(context,

                    UserManager.DISALLOW_MODIFY_ACCOUNTS, userInfo.id)) {

            profileData.addAccountPreference = newAddAccountPreference(context);

            if (RestrictedLockUtils.hasBaseUserRestriction(context,

                    UserManager.DISALLOW_MODIFY_ACCOUNTS, userInfo.id)) {

                profileData.addAccountPreference.setEnabled(false);

            } else {

                profileData.addAccountPreference.checkRestrictionAndSetDisabled(

                        DISALLOW_MODIFY_ACCOUNTS, userInfo.id);

            }

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

+10 −6
Original line number Diff line number Diff line
@@ -267,13 +267,16 @@ public class AccountSyncSettings extends AccountPreferenceBase { 
        MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0,

                getString(R.string.sync_menu_sync_cancel))

                .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);

        if (!RestrictedLockUtils.hasBaseUserRestriction(getPrefContext(),

                UserManager.DISALLOW_MODIFY_ACCOUNTS, mUserHandle.getIdentifier())) {



        MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,

                getString(R.string.remove_account_label))

                .setIcon(R.drawable.ic_menu_delete);

        removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |

                MenuItem.SHOW_AS_ACTION_WITH_TEXT);

        if (RestrictedLockUtils.hasBaseUserRestriction(getPrefContext(),

                UserManager.DISALLOW_MODIFY_ACCOUNTS, mUserHandle.getIdentifier())) {

            removeAccount.setEnabled(false);

        } else {

            EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(

                    getPrefContext(), UserManager.DISALLOW_MODIFY_ACCOUNTS,

                    mUserHandle.getIdentifier());
@@ -284,6 +287,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { 
            RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),

                    removeAccount, admin);

        }



        syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |

                MenuItem.SHOW_AS_ACTION_WITH_TEXT);

        syncCancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |