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

Commit 7bd69425 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Revert "Remove attention controller"" into qt-qpr1-dev am: 1876b8c6 

am: ca51533d

Change-Id: I7f1e7b3ddc83ce806d826bfd2ff40b89c44bc386
parents 68e9c89f ca51533d

res/xml/security_settings_face.xml

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,13 @@ 
    <PreferenceCategory

        android:key="security_settings_face_manage_category"

        android:title="@string/security_settings_face_settings_require_category">

        <SwitchPreference

            android:key="security_settings_face_require_attention"

            android:title="@string/security_settings_face_settings_require_attention"

            android:summary="@string/security_settings_face_settings_require_attention_details"

            app:keywords="@string/keywords_face_unlock"

            app:controller="com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController"/>



        <SwitchPreference

            android:key="security_settings_face_require_confirmation"

            android:title="@string/security_settings_face_settings_require_confirmation"

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

+9 −2
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public class FaceSettings extends DashboardFragment { 
    private FaceManager mFaceManager;

    private int mUserId;

    private byte[] mToken;

    private FaceSettingsAttentionPreferenceController mAttentionController;

    private FaceSettingsRemoveButtonPreferenceController mRemoveController;

    private FaceSettingsEnrollButtonPreferenceController mEnrollController;

    private List<AbstractPreferenceController> mControllers;
@@ -132,11 +133,12 @@ public class FaceSettings extends DashboardFragment { 


        Preference keyguardPref = findPreference(FaceSettingsKeyguardPreferenceController.KEY);

        Preference appPref = findPreference(FaceSettingsAppPreferenceController.KEY);

        Preference attentionPref = findPreference(FaceSettingsAttentionPreferenceController.KEY);

        Preference confirmPref = findPreference(FaceSettingsConfirmPreferenceController.KEY);

        Preference bypassPref =

                findPreference(FaceSettingsLockscreenBypassPreferenceController.KEY);

        mTogglePreferences = new ArrayList<>(

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

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



        mRemoveButton = findPreference(FaceSettingsRemoveButtonPreferenceController.KEY);

        mEnrollButton = findPreference(FaceSettingsEnrollButtonPreferenceController.KEY);
@@ -180,6 +182,7 @@ public class FaceSettings extends DashboardFragment { 
                finish();

            }

        } else {

            mAttentionController.setToken(mToken);

            mEnrollController.setToken(mToken);

        }
@@ -200,6 +203,7 @@ public class FaceSettings extends DashboardFragment { 
                    mToken = data.getByteArrayExtra(

                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);

                    if (mToken != null) {

                        mAttentionController.setToken(mToken);

                        mEnrollController.setToken(mToken);

                    }

                }
@@ -243,7 +247,9 @@ public class FaceSettings extends DashboardFragment { 
        mControllers = buildPreferenceControllers(context, getSettingsLifecycle());

        // There's no great way of doing this right now :/

        for (AbstractPreferenceController controller : mControllers) {

            if (controller instanceof FaceSettingsRemoveButtonPreferenceController) {

            if (controller instanceof FaceSettingsAttentionPreferenceController) {

                mAttentionController = (FaceSettingsAttentionPreferenceController) controller;

            } else if (controller instanceof FaceSettingsRemoveButtonPreferenceController) {

                mRemoveController = (FaceSettingsRemoveButtonPreferenceController) controller;

                mRemoveController.setListener(mRemovalListener);

                mRemoveController.setActivity((SettingsActivity) getActivity());
@@ -261,6 +267,7 @@ public class FaceSettings extends DashboardFragment { 
        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new FaceSettingsKeyguardPreferenceController(context));

        controllers.add(new FaceSettingsAppPreferenceController(context));

        controllers.add(new FaceSettingsAttentionPreferenceController(context));

        controllers.add(new FaceSettingsRemoveButtonPreferenceController(context));

        controllers.add(new FaceSettingsFooterPreferenceController(context));

        controllers.add(new FaceSettingsConfirmPreferenceController(context));