diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml index 7d59f30c5ad..1561e8c59c8 100644 --- a/res/xml/security_settings_face.xml +++ b/res/xml/security_settings_face.xml @@ -51,13 +51,6 @@ - - mControllers; @@ -126,12 +125,11 @@ 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, attentionPref, confirmPref, bypassPref)); + Arrays.asList(keyguardPref, appPref, confirmPref, bypassPref)); mRemoveButton = findPreference(FaceSettingsRemoveButtonPreferenceController.KEY); mEnrollButton = findPreference(FaceSettingsEnrollButtonPreferenceController.KEY); @@ -175,7 +173,6 @@ public class FaceSettings extends DashboardFragment { finish(); } } else { - mAttentionController.setToken(mToken); mEnrollController.setToken(mToken); } @@ -196,7 +193,6 @@ public class FaceSettings extends DashboardFragment { mToken = data.getByteArrayExtra( ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN); if (mToken != null) { - mAttentionController.setToken(mToken); mEnrollController.setToken(mToken); } } @@ -240,9 +236,7 @@ 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 FaceSettingsAttentionPreferenceController) { - mAttentionController = (FaceSettingsAttentionPreferenceController) controller; - } else if (controller instanceof FaceSettingsRemoveButtonPreferenceController) { + if (controller instanceof FaceSettingsRemoveButtonPreferenceController) { mRemoveController = (FaceSettingsRemoveButtonPreferenceController) controller; mRemoveController.setListener(mRemovalListener); mRemoveController.setActivity((SettingsActivity) getActivity()); @@ -261,7 +255,6 @@ public class FaceSettings extends DashboardFragment { controllers.add(new FaceSettingsVideoPreferenceController(context)); 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));