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

Removed redundant face unlock option.

Browse Source 
Test: To be updated.
Fixes: 234309000
Change-Id: I5fcf682860de9b76d61878df04182bc382292f56
This commit is contained in:
Diya Bera
2022-08-16 22:31:29 +00:00
parent bb2aebbf5e
commit 347cd8bca3
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
View File

@@ -40,6 +40,7 @@ public class CombinedBiometricStatusPreferenceController extends
@VisibleForTesting @VisibleForTesting
RestrictedPreference mPreference; RestrictedPreference mPreference;
protected final CombinedBiometricStatusUtils mCombinedBiometricStatusUtils; protected final CombinedBiometricStatusUtils mCombinedBiometricStatusUtils;
private PreferenceScreen mPreferenceScreen;
public CombinedBiometricStatusPreferenceController(Context context) { public CombinedBiometricStatusPreferenceController(Context context) {
this(context, KEY_BIOMETRIC_SETTINGS, null /* lifecycle */); this(context, KEY_BIOMETRIC_SETTINGS, null /* lifecycle */);
@@ -66,11 +67,15 @@ public class CombinedBiometricStatusPreferenceController extends
@OnLifecycleEvent(Lifecycle.Event.ON_RESUME) @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
public void onResume() { public void onResume() {
updateStateInternal(); updateStateInternal();
if (mPreferenceScreen != null) {
displayPreference(mPreferenceScreen);
}
} }
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreferenceScreen = screen;
mPreference = screen.findPreference(mPreferenceKey); mPreference = screen.findPreference(mPreferenceKey);
} }

5
src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
View File

@@ -40,6 +40,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
protected final FaceManager mFaceManager; protected final FaceManager mFaceManager;
@VisibleForTesting @VisibleForTesting
RestrictedPreference mPreference; RestrictedPreference mPreference;
private PreferenceScreen mPreferenceScreen;
private final FaceStatusUtils mFaceStatusUtils; private final FaceStatusUtils mFaceStatusUtils;
public FaceStatusPreferenceController(Context context) { public FaceStatusPreferenceController(Context context) {
@@ -67,11 +68,15 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
@OnLifecycleEvent(Lifecycle.Event.ON_RESUME) @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
public void onResume() { public void onResume() {
updateStateInternal(); updateStateInternal();
if (mPreferenceScreen != null) {
displayPreference(mPreferenceScreen);
}
} }
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreferenceScreen = screen;
mPreference = screen.findPreference(mPreferenceKey); mPreference = screen.findPreference(mPreferenceKey);
} }

5
src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
View File

@@ -41,6 +41,7 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer
@VisibleForTesting @VisibleForTesting
RestrictedPreference mPreference; RestrictedPreference mPreference;
private final FingerprintStatusUtils mFingerprintStatusUtils; private final FingerprintStatusUtils mFingerprintStatusUtils;
private PreferenceScreen mPreferenceScreen;
public FingerprintStatusPreferenceController(Context context) { public FingerprintStatusPreferenceController(Context context) {
this(context, KEY_FINGERPRINT_SETTINGS); this(context, KEY_FINGERPRINT_SETTINGS);
@@ -68,11 +69,15 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer
@OnLifecycleEvent(Lifecycle.Event.ON_RESUME) @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
public void onResume() { public void onResume() {
updateStateInternal(); updateStateInternal();
if (mPreferenceScreen != null) {
displayPreference(mPreferenceScreen);
}
} }
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreferenceScreen = screen;
mPreference = screen.findPreference(mPreferenceKey); mPreference = screen.findPreference(mPreferenceKey);
} }