OSDN Git Service

1/n Start adding Face settings (base, intro)
authorKevin Chyn <kchyn@google.com>
Tue, 26 Jun 2018 00:58:31 +0000 (17:58 -0700)
committerKevin Chyn <kchyn@google.com>
Sat, 30 Jun 2018 01:19:34 +0000 (18:19 -0700)
commit4882e875aefd74758051570cb83a57127d1ab7df
tree4f07d98c61a6f32e3ecccff921546aa4a4f12953
parent87007778393facface3753401ac8d830280485fa
1/n Start adding Face settings (base, intro)

This change refactors common biometric settings code as well to minimize
duplicated code in areas such as:
    Preference Controller
    EnrollBase
    EnrollIntro

This change also updates ChooseLock to have Face + Pin/Pattern/Pass

Bug: 110589286

Test: Fingerprint settings/enrollment still works
Test: make -j56 RunSettingsRoboTests
Change-Id: Ie35406a01b85617423beece42683ac086e9bc4a7
31 files changed:
AndroidManifest.xml
res/drawable/face_enroll_introduction.xml [new file with mode: 0644]
res/drawable/ic_face_header.xml [new file with mode: 0644]
res/layout/face_enroll_introduction.xml [new file with mode: 0644]
res/layout/face_enroll_introduction_footer.xml [new file with mode: 0644]
res/values/strings.xml
res/values/styles.xml
res/values/themes.xml
res/xml/security_dashboard_settings.xml
src/com/android/settings/Utils.java
src/com/android/settings/biometrics/BiometricEnrollBase.java [moved from src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java with 86% similarity]
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java [new file with mode: 0644]
src/com/android/settings/biometrics/BiometricSettings.java [new file with mode: 0644]
src/com/android/settings/biometrics/BiometricStatusPreferenceController.java [new file with mode: 0644]
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java [new file with mode: 0644]
src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java [new file with mode: 0644]
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
src/com/android/settings/password/ChooseLockGeneric.java
src/com/android/settings/security/SecuritySettings.java
tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java [new file with mode: 0644]
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java