commit b4a0a0563d0eb9ea30336ba994aff9e3ca4032fc
author Diya Bera <diyab@google.com> Thu Nov 17 00:59:35 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 17 00:59:35 2022 +0000
tree 832e5ca60dfbd27cb279e7ac6c8ae1c8816ce333
parent dfe2bd2df29f8cb6728c4d42ae427b47794e9e66
parent 68903de369a49385214ef4dc512d4c88ad9489a2

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

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 2cbef99..8ba2010 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -53,6 +53,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
@@ -158,6 +159,8 @@
         private static final String KEY_IS_ENROLLING = "is_enrolled";
         private static final String KEY_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_FINGER_AUTH_SUCCESS = 1001;
@@ -177,6 +180,7 @@
         private FingerprintSettingsRequireScreenOnToAuthPreferenceController
                 mRequireScreenOnToAuthPreferenceController;
         private RestrictedSwitchPreference mRequireScreenOnToAuthPreference;
+        private PreferenceCategory mFingerprintUnlockCategory;
 
         private FingerprintManager mFingerprintManager;
         private FingerprintUpdater mFingerprintUpdater;
@@ -493,6 +497,7 @@
             addFingerprintItemPreferences(root);
             addPreferencesFromResource(getPreferenceScreenResId());
             mRequireScreenOnToAuthPreference = findPreference(KEY_REQUIRE_SCREEN_ON_TO_AUTH);
+            mFingerprintUnlockCategory = findPreference(KEY_FINGERPRINT_UNLOCK_CATEGORY);
             for (AbstractPreferenceController controller : mControllers) {
                 ((FingerprintSettingsPreferenceController) controller).setUserId(mUserId);
             }
@@ -504,7 +509,7 @@
                         mRequireScreenOnToAuthPreferenceController.setChecked(!isChecked);
                         return true;
                     });
-            mRequireScreenOnToAuthPreference.setVisible(false);
+            mFingerprintUnlockCategory.setVisible(false);
             if (isSfps()) {
                 setRequireScreenOnToAuthVisibility();
             }
@@ -517,9 +522,9 @@
             final boolean removalInProgress = mRemovalSidecar.inProgress();
             // Removing last remaining fingerprint
             if (fingerprintsEnrolled == 0 && removalInProgress) {
-                mRequireScreenOnToAuthPreference.setVisible(false);
+                mFingerprintUnlockCategory.setVisible(false);
             } else {
-                mRequireScreenOnToAuthPreference.setVisible(true);
+                mFingerprintUnlockCategory.setVisible(true);
             }
         }