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

Merge "Fix require on screen toggle on guest user." into udc-qpr-dev am: 800728a5a6 am: 7461036d68

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23714620

Change-Id: I62554d897396b165f02bac58b0d1d9673a409033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hao Dong
2023-06-23 04:56:28 +00:00
committed by Automerger Merge Worker
parent 535f18a044 7461036d68
commit 59a4bf3565
2 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -169,7 +169,8 @@ public class FingerprintSettings extends SubSettings {
private static final String KEY_LAUNCHED_CONFIRM = "launched_confirm";
private static final String KEY_HAS_FIRST_ENROLLED = "has_first_enrolled";
private static final String KEY_IS_ENROLLING = "is_enrolled";
private static final String KEY_REQUIRE_SCREEN_ON_TO_AUTH =
@VisibleForTesting
static final String KEY_REQUIRE_SCREEN_ON_TO_AUTH =
"security_settings_require_screen_on_to_auth";
private static final String KEY_FINGERPRINTS_ENROLLED_CATEGORY =
"security_settings_fingerprints_enrolled";
@@ -536,10 +537,6 @@ public class FingerprintSettings extends SubSettings {
private void addFingerprintPreferences(PreferenceGroup root) {
final String fpPrefKey = addFingerprintItemPreferences(root);
if (isSfps()) {
scrollToPreference(fpPrefKey);
addFingerprintUnlockCategory();
}
for (AbstractPreferenceController controller : mControllers) {
if (controller instanceof FingerprintSettingsPreferenceController) {
((FingerprintSettingsPreferenceController) controller).setUserId(mUserId);
@@ -547,6 +544,14 @@ public class FingerprintSettings extends SubSettings {
((FingerprintUnlockCategoryController) controller).setUserId(mUserId);
}
}
// This needs to be after setting ids, otherwise
// |mRequireScreenOnToAuthPreferenceController.isChecked| is always checking the primary
// user instead of the user with |mUserId|.
if (isSfps()) {
scrollToPreference(fpPrefKey);
addFingerprintUnlockCategory();
}
createFooterPreference(root);
}