PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Remove attention controller"" into qt-qpr1-dev

Browse Source 
am: 1876b8c6dd

Change-Id: I5282deec73015da2920c0b429e1e23c5f97d4fbe
This commit is contained in:
Kevin Chyn
2019-11-01 10:06:20 -07:00
committed by android-build-merger
parent 3ba07e6fa5 1876b8c6dd
commit ca51533d56
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/xml/security_settings_face.xml
View File

@@ -51,6 +51,13 @@
<PreferenceCategory <PreferenceCategory
android:key="security_settings_face_manage_category" android:key="security_settings_face_manage_category"
android:title="@string/security_settings_face_settings_require_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 <SwitchPreference
android:key="security_settings_face_require_confirmation" android:key="security_settings_face_require_confirmation"
android:title="@string/security_settings_face_settings_require_confirmation" android:title="@string/security_settings_face_settings_require_confirmation"

11
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -60,6 +60,7 @@ public class FaceSettings extends DashboardFragment {
private FaceManager mFaceManager; private FaceManager mFaceManager;
private int mUserId; private int mUserId;
private byte[] mToken; private byte[] mToken;
private FaceSettingsAttentionPreferenceController mAttentionController;
private FaceSettingsRemoveButtonPreferenceController mRemoveController; private FaceSettingsRemoveButtonPreferenceController mRemoveController;
private FaceSettingsEnrollButtonPreferenceController mEnrollController; private FaceSettingsEnrollButtonPreferenceController mEnrollController;
private List<AbstractPreferenceController> mControllers; private List<AbstractPreferenceController> mControllers;
@@ -125,11 +126,12 @@ public class FaceSettings extends DashboardFragment {
Preference keyguardPref = findPreference(FaceSettingsKeyguardPreferenceController.KEY); Preference keyguardPref = findPreference(FaceSettingsKeyguardPreferenceController.KEY);
Preference appPref = findPreference(FaceSettingsAppPreferenceController.KEY); Preference appPref = findPreference(FaceSettingsAppPreferenceController.KEY);
Preference attentionPref = findPreference(FaceSettingsAttentionPreferenceController.KEY);
Preference confirmPref = findPreference(FaceSettingsConfirmPreferenceController.KEY); Preference confirmPref = findPreference(FaceSettingsConfirmPreferenceController.KEY);
Preference bypassPref = Preference bypassPref =
findPreference(FaceSettingsLockscreenBypassPreferenceController.KEY); findPreference(FaceSettingsLockscreenBypassPreferenceController.KEY);
mTogglePreferences = new ArrayList<>( mTogglePreferences = new ArrayList<>(
Arrays.asList(keyguardPref, appPref, confirmPref, bypassPref)); Arrays.asList(keyguardPref, appPref, attentionPref, confirmPref, bypassPref));
mRemoveButton = findPreference(FaceSettingsRemoveButtonPreferenceController.KEY); mRemoveButton = findPreference(FaceSettingsRemoveButtonPreferenceController.KEY);
mEnrollButton = findPreference(FaceSettingsEnrollButtonPreferenceController.KEY); mEnrollButton = findPreference(FaceSettingsEnrollButtonPreferenceController.KEY);
@@ -173,6 +175,7 @@ public class FaceSettings extends DashboardFragment {
finish(); finish();
} }
} else { } else {
mAttentionController.setToken(mToken);
mEnrollController.setToken(mToken); mEnrollController.setToken(mToken);
} }
@@ -193,6 +196,7 @@ public class FaceSettings extends DashboardFragment {
mToken = data.getByteArrayExtra( mToken = data.getByteArrayExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN); ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
if (mToken != null) { if (mToken != null) {
mAttentionController.setToken(mToken);
mEnrollController.setToken(mToken); mEnrollController.setToken(mToken);
} }
} }
@@ -236,7 +240,9 @@ public class FaceSettings extends DashboardFragment {
mControllers = buildPreferenceControllers(context, getSettingsLifecycle()); mControllers = buildPreferenceControllers(context, getSettingsLifecycle());
// There's no great way of doing this right now :/ // There's no great way of doing this right now :/
for (AbstractPreferenceController controller : mControllers) { for (AbstractPreferenceController controller : mControllers) {
if (controller instanceof FaceSettingsRemoveButtonPreferenceController) { if (controller instanceof FaceSettingsAttentionPreferenceController) {
mAttentionController = (FaceSettingsAttentionPreferenceController) controller;
} else if (controller instanceof FaceSettingsRemoveButtonPreferenceController) {
mRemoveController = (FaceSettingsRemoveButtonPreferenceController) controller; mRemoveController = (FaceSettingsRemoveButtonPreferenceController) controller;
mRemoveController.setListener(mRemovalListener); mRemoveController.setListener(mRemovalListener);
mRemoveController.setActivity((SettingsActivity) getActivity()); mRemoveController.setActivity((SettingsActivity) getActivity());
@@ -255,6 +261,7 @@ public class FaceSettings extends DashboardFragment {
controllers.add(new FaceSettingsVideoPreferenceController(context)); controllers.add(new FaceSettingsVideoPreferenceController(context));
controllers.add(new FaceSettingsKeyguardPreferenceController(context)); controllers.add(new FaceSettingsKeyguardPreferenceController(context));
controllers.add(new FaceSettingsAppPreferenceController(context)); controllers.add(new FaceSettingsAppPreferenceController(context));
controllers.add(new FaceSettingsAttentionPreferenceController(context));
controllers.add(new FaceSettingsRemoveButtonPreferenceController(context)); controllers.add(new FaceSettingsRemoveButtonPreferenceController(context));
controllers.add(new FaceSettingsFooterPreferenceController(context)); controllers.add(new FaceSettingsFooterPreferenceController(context));
controllers.add(new FaceSettingsConfirmPreferenceController(context)); controllers.add(new FaceSettingsConfirmPreferenceController(context));