From 347cd8bca3c1ee3db2a4554218e793395b65aeb4 Mon Sep 17 00:00:00 2001 From: Diya Bera Date: Tue, 16 Aug 2022 22:31:29 +0000 Subject: [PATCH] Removed redundant face unlock option. Test: To be updated. Fixes: 234309000 Change-Id: I5fcf682860de9b76d61878df04182bc382292f56 --- .../CombinedBiometricStatusPreferenceController.java | 5 +++++ .../biometrics/face/FaceStatusPreferenceController.java | 5 +++++ .../fingerprint/FingerprintStatusPreferenceController.java | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java index ba09e5fbe6a..978fb0d1534 100644 --- a/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java @@ -40,6 +40,7 @@ public class CombinedBiometricStatusPreferenceController extends @VisibleForTesting RestrictedPreference mPreference; protected final CombinedBiometricStatusUtils mCombinedBiometricStatusUtils; + private PreferenceScreen mPreferenceScreen; public CombinedBiometricStatusPreferenceController(Context context) { this(context, KEY_BIOMETRIC_SETTINGS, null /* lifecycle */); @@ -66,11 +67,15 @@ public class CombinedBiometricStatusPreferenceController extends @OnLifecycleEvent(Lifecycle.Event.ON_RESUME) public void onResume() { updateStateInternal(); + if (mPreferenceScreen != null) { + displayPreference(mPreferenceScreen); + } } @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); + mPreferenceScreen = screen; mPreference = screen.findPreference(mPreferenceKey); } diff --git a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java index 9b4b433237b..7c419579c83 100644 --- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java @@ -40,6 +40,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon protected final FaceManager mFaceManager; @VisibleForTesting RestrictedPreference mPreference; + private PreferenceScreen mPreferenceScreen; private final FaceStatusUtils mFaceStatusUtils; public FaceStatusPreferenceController(Context context) { @@ -67,11 +68,15 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon @OnLifecycleEvent(Lifecycle.Event.ON_RESUME) public void onResume() { updateStateInternal(); + if (mPreferenceScreen != null) { + displayPreference(mPreferenceScreen); + } } @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); + mPreferenceScreen = screen; mPreference = screen.findPreference(mPreferenceKey); } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java index 62edcf03974..1ed06880ac8 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java @@ -41,6 +41,7 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer @VisibleForTesting RestrictedPreference mPreference; private final FingerprintStatusUtils mFingerprintStatusUtils; + private PreferenceScreen mPreferenceScreen; public FingerprintStatusPreferenceController(Context context) { this(context, KEY_FINGERPRINT_SETTINGS); @@ -68,11 +69,15 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer @OnLifecycleEvent(Lifecycle.Event.ON_RESUME) public void onResume() { updateStateInternal(); + if (mPreferenceScreen != null) { + displayPreference(mPreferenceScreen); + } } @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); + mPreferenceScreen = screen; mPreference = screen.findPreference(mPreferenceKey); }