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

SysUI only enforces this setting while a secure lock screen is set,
so it doesn't make sense to show it configurable while an insecure
lock screen is set.

Bug: 148015798
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.users.AddUserWhenLockedPreferenceControllerTest"
Change-Id: I186b2339e9575e20b55e2e5c1dab3de624848fc5
This commit is contained in:
Ben Murdoch
2020-01-23 15:41:26 +00:00
parent 13fa76e16d
commit 0149363a39
3 changed files with 58 additions and 5 deletions

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);