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

Merge "Show "Add users from lock screen" dependent on secure lock screen."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-10 12:32:12 +00:00
committed by Android (Google) Code Review
parent 2db8d1d88f 0149363a39
commit 970d9167d2
3 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,20 +16,25 @@
package com.android.settings.users;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedSwitchPreference;
public class AddUserWhenLockedPreferenceController extends TogglePreferenceController {
private final UserCapabilities mUserCaps;
private final LockPatternUtils mLockPatternUtils;
public AddUserWhenLockedPreferenceController(Context context, String key) {
public AddUserWhenLockedPreferenceController(
Context context, String key, LockPatternUtils lockPatternUtils) {
super(context, key);
mUserCaps = UserCapabilities.create(context);
mLockPatternUtils = lockPatternUtils;
}
@Override
@@ -53,6 +58,8 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr
return DISABLED_FOR_USER;
} else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) {
return DISABLED_FOR_USER;
} else if (!mLockPatternUtils.isSecure(UserHandle.myUserId())) {
return CONDITIONALLY_UNAVAILABLE;
} else {
return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}

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

@@ -240,7 +240,7 @@ public class UserSettings extends SettingsPreferenceFragment
}
mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(
activity, KEY_ADD_USER_WHEN_LOCKED);
activity, KEY_ADD_USER_WHEN_LOCKED, new LockPatternUtils(getPrefContext()));
mMultiUserFooterPreferenceController = new MultiUserFooterPreferenceController(activity,
KEY_MULTIUSER_FOOTER);
@@ -1290,7 +1290,8 @@ public class UserSettings extends SettingsPreferenceFragment
boolean suppressAllPage) {
final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId,
suppressAllPage);
new AddUserWhenLockedPreferenceController(context, KEY_ADD_USER_WHEN_LOCKED)
new AddUserWhenLockedPreferenceController(
context, KEY_ADD_USER_WHEN_LOCKED, new LockPatternUtils(context))
.updateNonIndexableKeys(niks);
new AutoSyncDataPreferenceController(context, null /* parent */)
.updateNonIndexableKeys(niks);