From 1181760b86517947c129e8650a8d6cab716904bd Mon Sep 17 00:00:00 2001 From: Diya Bera Date: Thu, 3 Nov 2022 21:19:37 +0000 Subject: [PATCH] Remove "require screen on to auth" preference for Udfps Fixes: 257272989 Test: N/A Change-Id: Ic10bd02c7a26e58abcb471c3f495d65247f29edc --- .../fingerprint/FingerprintSettings.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 1c7c891899e..2cbef992ead 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -243,7 +243,9 @@ public class FingerprintSettings extends SubSettings { } private void updateDialog() { - setRequireScreenOnToAuthVisibility(); + if (isSfps()) { + setRequireScreenOnToAuthVisibility(); + } RenameDialog renameDialog = (RenameDialog) getFragmentManager(). findFragmentByTag(RenameDialog.class.getName()); if (renameDialog != null) { @@ -455,6 +457,15 @@ public class FingerprintSettings extends SubSettings { 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 @@ public class FingerprintSettings extends SubSettings { mRequireScreenOnToAuthPreferenceController.setChecked(!isChecked); return true; }); + mRequireScreenOnToAuthPreference.setVisible(false); + if (isSfps()) { + setRequireScreenOnToAuthVisibility(); + } setPreferenceScreen(root); return root; }