OSDN Git Service

DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent
authorSteven Ng <stevenckng@google.com>
Tue, 27 Sep 2016 22:31:45 +0000 (23:31 +0100)
committerSteven Ng <stevenckng@google.com>
Wed, 28 Sep 2016 15:24:14 +0000 (15:24 +0000)
commitda738b2edc528a9c0a7a048a7d820e57f391e979
tree5cd17939ceba6be28172e177fd477d9ca16643fe
parentd76a3ed937fc783a7a7beeda0fe5f73d3ae9b6c4
DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent

Cherry-pick from ag/1444396

1) Added a trampoline activity to display SET_NEW_PASSWORD intent.
2) On devices that have fingerprint sensor and have no enrolled fingerprint,
   ChooseLockGeneric handles the SET_NEW_PASSWORD intent by providing
   fingerprint + {PIN/PATTERN/PASSWORD} and skip fingerprint options.

Test: See below
1) Auto
   make RunSettingsRoboTests
2) Manual
   a) Fingerprint + pattern
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Pixel Imprint + Pattern.
      iii) Set a pattern lock.
      iv) Can enroll a fingerprint.
   b) Pattern
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Continue without Pixel Imprint
      iii) A list of unlock options, without fingerprint option, is shown.
      vi) Select and enroll a pattern lock
   c) Has an existing password
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Setting app asks for password input.
      iii) Enter password and click "Continue without Pixel imprint".
      vi) No password is asked. A list of unlock options, without fingerprint option, is shown.
      v) Select and enroll a pattern lock
   d) Work profile
      i) Create a work profile
      ii) adb shell am start --user x -a android.app.action.SET_NEW_PASSWORD. X is the work profile user id.
      iii) Click Pixel Imprint + Pattern.
      iv) Set a pattern lock.
      v) Can enroll a fingerprint.

Bug: 23017051
Change-Id: I6384bbffb72a5d3a83972da7474532746e4d06b9
AndroidManifest.xml
res/layout/choose_lock_generic_fingerprint_header.xml
res/values/strings.xml
res/values/styles.xml
res/xml/security_settings_picker.xml
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/fingerprint/FingerprintEnrollBase.java
src/com/android/settings/password/SetNewPasswordActivity.java [new file with mode: 0644]
src/com/android/settings/password/SetNewPasswordController.java [new file with mode: 0644]
tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java [new file with mode: 0644]