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

Commit eeb92a8c authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Remove "require screen on to auth" preference for Udfps" into... 

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

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



Change-Id: Ia88b3045e75f31e0a4590a085bf0b5436dfe7a15
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 218bd883 6a5d3528

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

+16 −1
Original line number Diff line number Diff line
@@ -243,7 +243,9 @@ public class FingerprintSettings extends SubSettings { 
                    }



                    private void updateDialog() {

                        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;

        }