OSDN Git Service

Show Choose/ConfirmLock before showing BiometricEnrollIntroduction
authorKevin Chyn <kchyn@google.com>
Tue, 18 Dec 2018 02:42:52 +0000 (18:42 -0800)
committerKevin Chyn <kchyn@google.com>
Tue, 18 Dec 2018 21:59:45 +0000 (13:59 -0800)
commit69e8a089d7b889bad031c23d60fd061089f6ba1b
treeac2cc1881a44112feeed30031776d8c22f628293
parent3f5966bb483b8db8e1c3e2d476edca7482ecf72b
Show Choose/ConfirmLock before showing BiometricEnrollIntroduction

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
src/com/android/settings/biometrics/BiometricEnrollBase.java
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
src/com/android/settings/password/SetupChooseLockPassword.java
src/com/android/settings/password/SetupChooseLockPattern.java
tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java