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

Merge "Remove "Add users from lock screen" from secondary users"

Browse Source
This commit is contained in:
Raff Tsai
2019-03-08 01:05:31 +00:00
committed by Android (Google) Code Review
parent f574d22f23 b508184d60
commit 39832ae341
3 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
View File

@@ -38,9 +38,13 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr
mUserCaps.updateAddUserCapabilities(mContext);
final RestrictedSwitchPreference restrictedSwitchPreference =
(RestrictedSwitchPreference) preference;
restrictedSwitchPreference.setDisabledByAdmin(
mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);
restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled);
if (!isAvailable()) {
restrictedSwitchPreference.setVisible(false);
} else {
restrictedSwitchPreference.setDisabledByAdmin(
mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);
restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled);
}
}
@Override

6
src/com/android/settings/users/UserSettings.java
View File

@@ -289,10 +289,8 @@ public class UserSettings extends SettingsPreferenceFragment
}
final PreferenceScreen screen = getPreferenceScreen();
if (mAddUserWhenLockedPreferenceController.isAvailable()) {
mAddUserWhenLockedPreferenceController.updateState(screen.findPreference(
mAddUserWhenLockedPreferenceController.getPreferenceKey()));
}
mAddUserWhenLockedPreferenceController.updateState(screen.findPreference(
mAddUserWhenLockedPreferenceController.getPreferenceKey()));
if (mShouldUpdateUserList) {
updateUI();