commit 6a5d3528d6fba4682a14dd67abcccaa0a62b75b8
author Joshua Mccloskey <joshmccloskey@google.com> Fri Nov 04 01:24:54 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 04 01:24:54 2022 +0000
tree 0d2223c4f5bb7a11baf791e9a37bd1df75e64bc6
parent e3162c2a6bfee3f4222663fb8e719b7b0741ee00
parent c4e603688e9020c96f3f6abc04b8a637aa259863

Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev am: c4e603688e

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

Change-Id: Ia13069fcb0141a4f92fff8c1fd203302c059063f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 1c7c891..2cbef99 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -243,7 +243,9 @@
                     }
 
                     private void updateDialog() {
-                        setRequireScreenOnToAuthVisibility();
+                        if (isSfps()) {
+                            setRequireScreenOnToAuthVisibility();
+                        }
                         RenameDialog renameDialog = (RenameDialog) getFragmentManager().
                                 findFragmentByTag(RenameDialog.class.getName());
                         if (renameDialog != null) {
@@ -455,6 +457,15 @@
             return false;
         }
 
+        private boolean isSfps() {
+            for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {
+                if (prop.isAnySidefpsType()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         protected void removeFingerprintPreference(int fingerprintId) {
             String name = genKey(fingerprintId);
             Preference prefToRemove = findPreference(name);
@@ -493,6 +504,10 @@
                         mRequireScreenOnToAuthPreferenceController.setChecked(!isChecked);
                         return true;
                     });
+            mRequireScreenOnToAuthPreference.setVisible(false);
+            if (isSfps()) {
+                setRequireScreenOnToAuthVisibility();
+            }
             setPreferenceScreen(root);
             return root;
         }