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

Merge "Remove delay from enroll start button" into qt-r1-dev

Browse Source
This commit is contained in:
Kevin Chyn
2019-08-19 21:50:22 +00:00
committed by Android (Google) Code Review
parent 7892f729a5 058af41a42
commit ca2bbdfeca
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.biometrics.face; package com.android.settings.biometrics.face;
import static android.provider.Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED;
import static android.security.KeyStore.getApplicationContext; import static android.security.KeyStore.getApplicationContext;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
@@ -50,8 +49,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
private static final String TAG = "FaceEducation"; private static final String TAG = "FaceEducation";
private static final int ON = 1; private static final int ON = 1;
private static final int OFF = 0; private static final int OFF = 0;
// 8 seconds.
private static final long FACE_ENROLL_EDUCATION_DELAY = 3000;
private FaceManager mFaceManager; private FaceManager mFaceManager;
private FaceEnrollAccessibilityToggle mSwitchDiversity; private FaceEnrollAccessibilityToggle mSwitchDiversity;
@@ -140,21 +137,9 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
&& accessibilityManager.isTouchExplorationEnabled(); && accessibilityManager.isTouchExplorationEnabled();
} }
mFooterBarMixin.setPrimaryButton(footerButton); mFooterBarMixin.setPrimaryButton(footerButton);
final Context context = getApplicationContext();
final boolean didDisplayEdu = Settings.Secure.getIntForUser(context.getContentResolver(),
FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, OFF, mUserId) == ON;
if (!didDisplayEdu && !accessibilityEnabled) {
Settings.Secure.putIntForUser(context.getContentResolver(),
FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, ON, mUserId);
footerButton.setEnabled(false);
mHandler.postDelayed(() -> {
footerButton.setEnabled(true);
}, FACE_ENROLL_EDUCATION_DELAY);
}
final Button accessibilityButton = findViewById(R.id.accessibility_button); final Button accessibilityButton = findViewById(R.id.accessibility_button);
accessibilityButton.setOnClickListener(view -> { accessibilityButton.setOnClickListener(view -> {
footerButton.setEnabled(true);
mSwitchDiversity.setChecked(true); mSwitchDiversity.setChecked(true);
accessibilityButton.setVisibility(View.GONE); accessibilityButton.setVisibility(View.GONE);
mSwitchDiversity.setVisibility(View.VISIBLE); mSwitchDiversity.setVisibility(View.VISIBLE);