PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \\"Disable instead of hiding add account preference\\" into nyc-mr1-dev am: 8738e406c8

Browse Source 
am: c76f7fcba1

Change-Id: I5ad4443041ef51f420fa056b8dbcd9af9d8fc5a5
This commit is contained in:
Tony Mak
2016-07-15 03:51:06 +00:00
committed by android-build-merger
parent 7c2e01ee55 c76f7fcba1
commit f869df20c4
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/accounts/AccountSettings.java
View File

@@ -310,9 +310,11 @@ public class AccountSettings extends SettingsPreferenceFragment
if (userInfo.isEnabled()) {
profileData.authenticatorHelper = new AuthenticatorHelper(context,
userInfo.getUserHandle(), this);
if (!RestrictedLockUtils.hasBaseUserRestriction(context,
profileData.addAccountPreference = newAddAccountPreference(context);
if (RestrictedLockUtils.hasBaseUserRestriction(context,
UserManager.DISALLOW_MODIFY_ACCOUNTS, userInfo.id)) {
profileData.addAccountPreference = newAddAccountPreference(context);
profileData.addAccountPreference.setEnabled(false);
} else {
profileData.addAccountPreference.checkRestrictionAndSetDisabled(
DISALLOW_MODIFY_ACCOUNTS, userInfo.id);
}