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

Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev am: b4a0a0563d

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

Change-Id: I65f8405eda3e12b83a365bd469a3a0ce3f5c9f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2022-11-17 01:13:18 +00:00
committed by Automerger Merge Worker
parent 6c1eae8a1e b4a0a0563d
commit 4688fd9074
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
@@ -158,6 +159,8 @@ public class FingerprintSettings extends SubSettings {
private static final String KEY_IS_ENROLLING = "is_enrolled"; private static final String KEY_IS_ENROLLING = "is_enrolled";
private static final String KEY_REQUIRE_SCREEN_ON_TO_AUTH = private static final String KEY_REQUIRE_SCREEN_ON_TO_AUTH =
"security_settings_require_screen_on_to_auth"; "security_settings_require_screen_on_to_auth";
private static final String KEY_FINGERPRINT_UNLOCK_CATEGORY =
"security_settings_fingerprint_unlock_category";
private static final int MSG_REFRESH_FINGERPRINT_TEMPLATES = 1000; private static final int MSG_REFRESH_FINGERPRINT_TEMPLATES = 1000;
private static final int MSG_FINGER_AUTH_SUCCESS = 1001; private static final int MSG_FINGER_AUTH_SUCCESS = 1001;
@@ -177,6 +180,7 @@ public class FingerprintSettings extends SubSettings {
private FingerprintSettingsRequireScreenOnToAuthPreferenceController private FingerprintSettingsRequireScreenOnToAuthPreferenceController
mRequireScreenOnToAuthPreferenceController; mRequireScreenOnToAuthPreferenceController;
private RestrictedSwitchPreference mRequireScreenOnToAuthPreference; private RestrictedSwitchPreference mRequireScreenOnToAuthPreference;
private PreferenceCategory mFingerprintUnlockCategory;
private FingerprintManager mFingerprintManager; private FingerprintManager mFingerprintManager;
private FingerprintUpdater mFingerprintUpdater; private FingerprintUpdater mFingerprintUpdater;
@@ -493,6 +497,7 @@ public class FingerprintSettings extends SubSettings {
addFingerprintItemPreferences(root); addFingerprintItemPreferences(root);
addPreferencesFromResource(getPreferenceScreenResId()); addPreferencesFromResource(getPreferenceScreenResId());
mRequireScreenOnToAuthPreference = findPreference(KEY_REQUIRE_SCREEN_ON_TO_AUTH); mRequireScreenOnToAuthPreference = findPreference(KEY_REQUIRE_SCREEN_ON_TO_AUTH);
mFingerprintUnlockCategory = findPreference(KEY_FINGERPRINT_UNLOCK_CATEGORY);
for (AbstractPreferenceController controller : mControllers) { for (AbstractPreferenceController controller : mControllers) {
((FingerprintSettingsPreferenceController) controller).setUserId(mUserId); ((FingerprintSettingsPreferenceController) controller).setUserId(mUserId);
} }
@@ -504,7 +509,7 @@ public class FingerprintSettings extends SubSettings {
mRequireScreenOnToAuthPreferenceController.setChecked(!isChecked); mRequireScreenOnToAuthPreferenceController.setChecked(!isChecked);
return true; return true;
}); });
mRequireScreenOnToAuthPreference.setVisible(false); mFingerprintUnlockCategory.setVisible(false);
if (isSfps()) { if (isSfps()) {
setRequireScreenOnToAuthVisibility(); setRequireScreenOnToAuthVisibility();
} }
@@ -517,9 +522,9 @@ public class FingerprintSettings extends SubSettings {
final boolean removalInProgress = mRemovalSidecar.inProgress(); final boolean removalInProgress = mRemovalSidecar.inProgress();
// Removing last remaining fingerprint // Removing last remaining fingerprint
if (fingerprintsEnrolled == 0 && removalInProgress) { if (fingerprintsEnrolled == 0 && removalInProgress) {
mRequireScreenOnToAuthPreference.setVisible(false); mFingerprintUnlockCategory.setVisible(false);
} else { } else {
mRequireScreenOnToAuthPreference.setVisible(true); mFingerprintUnlockCategory.setVisible(true);
} }
} }