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

Commit 69829e93 authored by Shawn Lin's avatar Shawn Lin Committed by Android (Google) Code Review
Browse files

Merge "Fixed crash in FaceSettings" into main

parents d09272e6 5d48e5d9

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

+26 −15
Original line number Diff line number Diff line
@@ -222,13 +222,22 @@ public class FaceSettings extends DashboardFragment { 
        Preference confirmPref = findPreference(FaceSettingsConfirmPreferenceController.KEY);

        Preference bypassPref =

                findPreference(mLockscreenController.getPreferenceKey());

        mTogglePreferences = new ArrayList<>(

                Arrays.asList(keyguardPref, appPref, attentionPref, confirmPref, bypassPref));



        if (Flags.biometricsOnboardingEducation()) {

            if (use(FaceSettingsKeyguardUnlockPreferenceController.class) != null) {

                Preference unlockKeyguard = findPreference(

                use(FaceSettingsKeyguardUnlockPreferenceController.class).getPreferenceKey());

                        use(FaceSettingsKeyguardUnlockPreferenceController.class)

                                .getPreferenceKey());

                mTogglePreferences.add(unlockKeyguard);

            }

            if (use(FaceSettingsAppsPreferenceController.class) != null) {

                Preference appsPref = findPreference(

                        use(FaceSettingsAppsPreferenceController.class).getPreferenceKey());

        mTogglePreferences = new ArrayList<>(

                Arrays.asList(keyguardPref, appPref, attentionPref, confirmPref, bypassPref,

                        unlockKeyguard, appsPref));

                mTogglePreferences.add(appsPref);

            }

        }



        if (RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(

                getContext(), DevicePolicyManager.KEYGUARD_DISABLE_FACE, mUserId) != null) {
@@ -241,6 +250,7 @@ public class FaceSettings extends DashboardFragment { 
        mRemoveButton = findPreference(FaceSettingsRemoveButtonPreferenceController.KEY);

        mEnrollButton = findPreference(FaceSettingsEnrollButtonPreferenceController.KEY);



        if (Flags.biometricsOnboardingEducation()) {

            mFaceEnrolledCategory = findPreference(PREF_KEY_FACE_ENROLLED_CATEGORY);

            mFaceRemoveButton = findPreference(PREF_KEY_FACE_REMOVE);

            mFaceRemoveButton.setIcon(R.drawable.ic_face);
@@ -250,6 +260,7 @@ public class FaceSettings extends DashboardFragment { 
            mFaceEnrollButton.setIcon(R.drawable.ic_add_24dp);

            mFaceEnrollButton.setOnPreferenceClickListener(

                    use(FaceSettingsEnrollButtonPreferenceController.class));

        }



        final boolean hasEnrolled = mFaceManager.hasEnrolledTemplates(mUserId);

        updateFaceAddAndRemovePreference(hasEnrolled);