From 058af41a42bffeff258f7c6c27f1cde78eb9e9f6 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Fri, 16 Aug 2019 16:40:39 -0700 Subject: [PATCH] Remove delay from enroll start button Fixes: 139554930 Test: manual, button no longer delayed Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404 Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404 --- .../biometrics/face/FaceEnrollEducation.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java index 011cc12ae7a..e1253c14796 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java @@ -16,7 +16,6 @@ package com.android.settings.biometrics.face; -import static android.provider.Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED; import static android.security.KeyStore.getApplicationContext; import android.app.settings.SettingsEnums; @@ -50,8 +49,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase { private static final String TAG = "FaceEducation"; private static final int ON = 1; private static final int OFF = 0; - // 8 seconds. - private static final long FACE_ENROLL_EDUCATION_DELAY = 3000; private FaceManager mFaceManager; private FaceEnrollAccessibilityToggle mSwitchDiversity; @@ -140,21 +137,9 @@ public class FaceEnrollEducation extends BiometricEnrollBase { && accessibilityManager.isTouchExplorationEnabled(); } 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); accessibilityButton.setOnClickListener(view -> { - footerButton.setEnabled(true); mSwitchDiversity.setChecked(true); accessibilityButton.setVisibility(View.GONE); mSwitchDiversity.setVisibility(View.VISIBLE);