Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c273cb26 authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Removed redundant face unlock option." into tm-qpr-dev am: 02ca9bd2 am: 0b34834c 

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



Change-Id: I2705711c1115b63603c7c45a80302a66a83648aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 002c6418 0b34834c

src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java

+5 −0
Original line number Diff line number Diff line
@@ -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);

    }

src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java

+5 −0
Original line number Diff line number Diff line
@@ -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);

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -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);

    }