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

Show Choose/ConfirmLock before showing BiometricEnrollIntroduction

Browse Source 
Skip button is now shown when ChooseLock is launched by
BiometricEnroll, otherwise users are forced to use passwords
(maybe good thing?)

Bug: 111548033

Test: Pin/pattern/pass must be set/confirmed before enrollment
Test: Able to enroll FP in SUW and Settings

Change-Id: Ic4bbeb539e4bf01c1c402dec308943292b43406d
This commit is contained in:
Kevin Chyn
2018-12-17 18:42:52 -08:00
parent 3f5966bb48
commit 69e8a089d7
10 changed files with 61 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/biometrics/BiometricEnrollBase.java
View File

@@ -67,8 +67,11 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity
*/
public static final int RESULT_TIMEOUT = RESULT_FIRST_USER + 2;
public static final int CONFIRM_REQUEST = 1;
public static final int ENROLLING = 2;
public static final int CHOOSE_LOCK_GENERIC_REQUEST = 1;
public static final int BIOMETRIC_FIND_SENSOR_REQUEST = 2;
public static final int LEARN_MORE_REQUEST = 3;
public static final int CONFIRM_REQUEST = 4;
public static final int ENROLLING = 5;
protected boolean mLaunchedConfirmLock;
protected byte[] mToken;
@@ -105,10 +108,6 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity
initViews();
}
protected boolean shouldLaunchConfirmLock() {
return mToken == null && !mLaunchedConfirmLock;
}
protected void initViews() {
getWindow().setStatusBarColor(Color.TRANSPARENT);
Button nextButton = getNextButton();