Commit Graph

312 Commits

Author SHA1 Message Date
Kevin Chyn
bcc288e801 Merge changes I9dea35a7,Iddcc0a65 into sc-dev
* changes:
  Update UDFPS "find sensor" string for a11y
  Update a few more strings
2021-05-13 22:27:59 +00:00
Kevin Chyn
6a43df9855 Update UDFPS "find sensor" string for a11y
Bug: 187999176
Test: manual
Change-Id: I9dea35a70aba87f5f2cc94fc73e74a5a624019b9
2021-05-13 15:20:37 -07:00
Kevin Chyn
9a4f0d2c6c Update a few more strings
1) Fingerprint intro page footer buttons
2) Screen lock removal positive button
3) Update UDFPS string logic
4) Update UDFPS strings during enrollment
5) Update generic fingerprint enroll completion message

Bug: 187868985
Test: manually, in settings and SUW
Change-Id: Iddcc0a65c3f410b4ae33a760dfcc57aba4bcc7f9
2021-05-13 11:47:41 -07:00
Curtis Belmonte
cef573f2d0 Consolidate face enroll intro/consent screens
Updates the UI of the face enroll intro screen based on the latest
mocks, while still allowing strings to be overlaid depending on the
device and/or face auth implementation.

Test: Manually tested face enrollment

Bug: 187207438
Change-Id: I5d912261b1eecfc7a241d6b48d549c4ff253ecdf
2021-05-12 17:26:17 -07:00
Joe Bolinger
971f0f3c5a Add userId parameter to all uses of challenge in settings.
Bug: 184915229

Test: manually on device (as normal, extra user, & work profile)
Change-Id: Id509b5866d53525b38a5bb95bbbcc723d6651745
2021-05-10 18:26:57 -07:00
TreeHugger Robot
0842cc9adc Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev 2021-05-07 20:25:35 +00:00
Joe Bolinger
955c8349ed Prevent multi-sensor enrollment from doing nothing.
Fix: 186499864
Test: manual (setup with managed account)
Change-Id: If2b2623b2e348ef9d335c81189dbe23e4fe5f003
2021-05-06 21:41:43 -07:00
TreeHugger Robot
b1b7029fa6 Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev 2021-05-07 02:58:16 +00:00
TreeHugger Robot
b3b59d6edd Merge "Refactor ChooseLockGenericController" into sc-dev 2021-05-06 23:59:17 +00:00
Rubin Xu
8e4acdbf51 Refactor ChooseLockGenericController
* Move all logics around aggregating password policies
  to the controller
* Replace HIDE_DISABLED_PREFS and MINIMUM_QUALITY_KEY
  with HIDE_INSECURE_OPTIONS as all call sites are just
  using them to hide insecure screenlock options.
* Remove password policy aggregation logic from
  ChooseLockPassword and make it use policies passed in.
* Remove padlock from disabled screen lock options,
  per UX mock.
* Increase char limit for some strings

Bug: 177638284
Bug: 177641868
Bug: 182561862
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Test: 1. set profile password quality/complexity and enroll device lock
      2. set profile password quality/complexity and enroll work challenge
      3. set parent password quality/complexity and enroll device lock
      4. set parent password quality/complexity and enroll work challenge
      5. set profile and parent password complexity, then enroll work challenge
      6. set profile and parent password complexity, then unify work challenge
      7. Enroll device lock during SUW
Change-Id: Iba1d37e6f33eba7b7e8e1f805f8e37aaec108404
2021-05-06 23:09:27 +01:00
Mill Chen
872db9c41a Add require scrolling button for FingerprintEnrolling intro
The consent in the fingerprint introduction has been updated. Users are
required to read through the content. Adding a scrolling button is to
prevent directly going to next page from this page. It also makes sure
the content has to be scrolled down to the bottom of page.

Fix: 184591438
Test: visual verified
1) Prepare a device with fingerprint sensor
2) Settings > Security > Fingerprint unlock
3) Entering the enrollment flow and see if the introduction has a button
named "More" on the right-bottom side.

Change-Id: I1916293807ca9fb04f5d576cf4f6aaccbbe1ff00
2021-05-06 17:29:38 +08:00
TreeHugger Robot
a75ba398fe Merge "Fix searching condition for biometric settings" into sc-dev 2021-05-06 05:37:08 +00:00
Mill Chen
ecd1495977 Fix searching condition for biometric settings
The preferences that are related to biometric settings should only be
searchable if the device supports the multiple biometric auth. However
we can see these preferences still can be searched even the device
doesn't support the feature, which is caused by that there's no
guardence. So the availiability of the preferences need to be updated to
prevent revealing unsupported preference from Settings search.

Fixes: 187167774
Test: manual test
1) Navigate to Settings search on a device without face auth
2) Search for face
3) See if there's something about face unlock

Change-Id: I6f120e8d9002a1e8f0be9361fdbea193776e4d7d
2021-05-05 23:35:53 +08:00
TreeHugger Robot
619321198c Merge "Fix back navigation in biometric enrollment." into sc-dev 2021-05-04 23:23:39 +00:00
Joe Bolinger
43d978bd7b Fix back navigation in biometric enrollment.
Using the back buttons can cause a crash in at least two cases. Skipping
face enrollment and then starting/stopping any enrollment can lead to
an invalid token and failed HAT request. Backing out of the activity and
restarting it can also lead to using a stale token that fails.

Fix: 179336333
Test: manual on device
Change-Id: I0c1133e4c3d9c97997043ddc9374aa3cfc4f1c97
2021-05-04 14:43:17 -07:00
Kevin Chyn
177d76986a Merge changes from topic "credential-removal-strings" into sc-dev
* changes:
  Update combined settings summary
  Update credential removal strings
2021-05-04 20:13:00 +00:00
Kevin Chyn
50dcf7955a Update combined settings summary
Display strings based on number of enrollments

Bug: 185804815
Test: manual on-device
Change-Id: I47be2a53b37c36b3136cd233001db7cadf123ae9
2021-05-03 16:15:56 -07:00
Kevin Chyn
33ba245149 Cancel enrollment when back or negative buttons pressed
Fixes: 183671394
Test: Go through enrollment flow and test various buttons
Change-Id: I8d3939de42ecd0a889f0c6d3c94002199285ef8b
2021-05-03 21:46:25 +00:00
TreeHugger Robot
fcb325c562 Merge "Fix several challenge paths" into sc-dev 2021-04-28 23:48:32 +00:00
Kevin Chyn
1f0cd17e3e Fix several challenge paths
1) Combined settings page should finish() when losing foreground
   (but not if fingerprint or face settings are launched from it)
2) Challenge should be generated when entering FaceSettings or
   FingerprintSettings each time. This allows us to leave the existing
   revokeChallenge paths in FaceSettings and FingerprintSettings.

Fixes: 186257202
Test: Manual

Change-Id: I1b6452f787279001a71628f220c01fcb86b88f3d
2021-04-28 13:01:28 -07:00
Joshua Mccloskey
5487f2fa6c Merge "Updated settings for new get/set feature change" into sc-dev 2021-04-25 23:20:35 +00:00
TreeHugger Robot
8eec01fc17 Merge "Do not auth in settings if UDFPS" into sc-dev 2021-04-23 20:12:46 +00:00
Mill Chen
8843157b01 Update confirming credential flow for biometric settings
The combined biometrics settings has been integrating face and
fingerprint authentication together, so the confirming credential flow
has to be invoked before entering biometrics settings page.

Bug: 183449119
Test: manual
Change-Id: I3c0d059241cb10a254868c2e388c4d3b20305b10
2021-04-23 15:33:32 +08:00
Mill Chen
7edebeef7e Combined biometric settings implementation
There will be multiple biometrics authentications existing at the same
time, so we added a new page for multiple biometrics to control
biometrics settings.

Bug: 183449119
Test: manual test
Change-Id: I359082caf771e07dfd5b24973cb8a3cf372c1b30
2021-04-23 15:18:08 +08:00
Kevin Chyn
7920117a1a Do not auth in settings if UDFPS
Fixes: 185670313
Test: manual
Change-Id: I0ccc85aa05807f54a38ff69a81f87e6a63be9504
2021-04-22 14:44:25 -07:00
Curtis Belmonte
d758022916 Log new auth-related framework atoms for Android 12
Adds logging to Settings for new authentication and biometric atoms
introduced as part of ag/13856328.

Test: Manually trigger each case and verify log statements are called.

Bug: 185136248
Change-Id: Ic41a89da4f148dc94864f140e85b55f63643681b
2021-04-20 17:33:16 -07:00
Joshua Mccloskey
64fdef1dc7 Updated settings for new get/set feature change
Test: Verified e2e get/set work within settings
Bug: 184657294
Change-Id: I0240b092751eb1ca205d1cf245c005c0fe9d4338
2021-04-20 11:08:59 -07:00
TreeHugger Robot
00f29b707e Merge "Remove multi-biometric interstitial screen in SUW" into sc-dev 2021-04-19 23:15:38 +00:00
Curtis Belmonte
5f1d13e3b0 Remove multi-biometric interstitial screen in SUW
On devices with multiple biometric sensors, this removes the
interstitial screen in Setup Wizard that let the user choose whether to
enroll face, fingerprint, or both. Instead, such devices will always
show face enrollment followed by fingerprint, with the option to skip
either or both.

Test: Manually tested all enroll/skip combinations in SUW

Fixes: 183720580
Change-Id: I7f045579f732196bde28dd96e9443e4bb4c906ae
2021-04-19 14:24:47 -07:00
Kevin Chyn
ee8fc8d587 Do not scan for fingerprint when rename dialog is showing
Fixes: 185670313
Test: manual
Change-Id: If153806d25c5397f1699d049a10c5bccaf87e413
2021-04-19 14:20:56 -07:00
Kevin Chyn
83b061d3da Actually use new string in fingerprint settings
Fixes: 185805485
Test: Manually inspect
Change-Id: I9a92d4198e3482d7f08d033f8d1242a28a39ef4a
2021-04-19 13:05:35 -07:00
Curtis Belmonte
91f88d6186 Add a config for the face enroll introduction activity
Test: manual

Bug: 185426108
Change-Id: I42e1f8dd5a20e8066fbd1374283acc1228427d45
2021-04-14 17:39:02 -07:00
Mill Chen
05c2a2bf41 Fix Settings crash
When pressing back from fingerprint enrollment flow, Settings will get
crashed. That was caused by calling a destroied fragment manager to
create an error dialog.

Bug: 184234884
Test: manual test
1) Settings -> Security -> Fingerprint
2) Following the enrollment flow, then pressing back from either find
sensor or enrolling page
3) Observe and see if there's no crash

Change-Id: I2028df0c6a65e8e960a627161834660681b7b70a
2021-04-06 12:35:14 +08:00
Mill Chen
4606a292ac Add an error dialog in FingerprintEnrollFindSensor
When a device stands for a while during the fingerprint enrollment, the
fingerprint icon will disappear without any warning message. This
change is trying to show a dialog to inform users.

Fixes: 180633056
Test: visual verified
1) Settings -> Security -> Fingerprint
2) Navigate to "Touch & hold the fingerprint icon" page
3) Let device stand for a while and see if there's a dialog shown

Change-Id: I69c8fb73f2a7406e4a379396e2624fb523e162a8
2021-03-30 21:49:11 +08:00
Mill Chen
474093e8cc Add a reverse landscape layout for UDFPS
Bug: 181614043
Test: visual verified
1) Settings -> Security -> Fingerprint
2) Follow the setup flow to find sensor page and enrolling page
3) Rotate your device and see if fingerprint icon is overlapping with
the title.

Change-Id: Ia1202e9688f2472c8063287164f4fc8f479cdae9
2021-03-29 11:53:13 +08:00
Edgar Wang
0c914077aa Merge "Change packagename of TwoTargetPreference" into sc-dev 2021-03-17 05:08:21 +00:00
TreeHugger Robot
53d7495162 Merge "Use title area for enrollment error messages" into sc-dev 2021-03-11 06:16:42 +00:00
Kevin Chyn
13b05b6fb8 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev
* changes:
  Update fingerprint revokeChallenge with frameworks/base
  Update revokeChallenge together with frameworks/base
2021-03-11 01:14:15 +00:00
Mill Chen
a01f882e61 Use title area for enrollment error messages
This CL is trying to put the enrollment error messages into the title
area for UDFPS, and left the red text for the older devices with a rear
fingerprint.

Fixes: 178432748
Test: visual verified
Change-Id: Ib3a81531219dc963723ad0de99f079a230c580f5
2021-03-10 19:46:13 +08:00
Kevin Chyn
39b2fe8bd5 Update fingerprint revokeChallenge with frameworks/base
Bug: 181977689
Test: manual
Change-Id: I92e6dae58d67f1355c6d0ba3bbf95ff2ad5247ed
2021-03-09 18:12:54 -08:00
Kevin Chyn
e91e39b604 Update revokeChallenge together with frameworks/base
Bug: 181977689
Test: Inspect logs
Change-Id: I588ec46896d57d89489f78505a6f2c932462b2d2
2021-03-09 16:25:28 -08:00
TreeHugger Robot
6ef1bc7336 Merge "Update fingerprint layouts for landscape" into sc-dev 2021-03-09 07:26:20 +00:00
Kevin Chyn
5dca77291b Merge "Do not re-start fingerprint auth if ERROR_USER_CANCELED" into sc-dev 2021-03-09 02:26:15 +00:00
Mill Chen
7cd08b6aa2 Update fingerprint layouts for landscape
- Refine the portrait layout to be reused for landscape
- Add strings for UDFPS enrollment
- Remove the landcaspe layout since it is no longer used.

Fixes: 171294253
Test: visual verified
Change-Id: Ibbfa5515437e2c2a348db9b621b4e60ba922a383
2021-03-09 06:14:27 +08:00
TreeHugger Robot
0b29ebd420 Merge "Update FingerprintEnrollFindSensor for landscape" into sc-dev 2021-03-08 08:46:12 +00:00
Mill Chen
f97df931df Update FingerprintEnrollFindSensor for landscape
SUW library can support landscape mode. It reuse the portrait layout to
render the screen for landscape. So we don't need to have a layout for
it. This change is to move the description to a subtitle and remove the
unused layout.

Bug: 179234361
Bug: 171294253
Bug: 179317709
Test: visual verified
Change-Id: Icfb3be799c1b4e190691731638aaa3467cadf624
2021-03-08 15:27:03 +08:00
Mill Chen
873d5ef6f5 Fix NPE crash during setup flow
The sud_layout_description text view has been removed and being replaced
with a subtitle of GlifLayout. This is why Settings crash during setup
flow. Removing the text view and putting the string in the right place
can fix this issue.

Fixes: 182095350
Test: robotest
Change-Id: I05ea6fe5a404a20a46cf17ab212e6f736a119fe4
2021-03-08 14:02:33 +08:00
Kevin Chyn
aa35b8fcab Do not re-start fingerprint auth if ERROR_USER_CANCELED
Fixes: 178403701
Test: Enter fingerprint settings, swipe up
Change-Id: I0762405f01d5dfd710ad8b4c4b0e8d4a2bd13b2e
2021-03-05 18:45:09 -08:00
Mill Chen
c2be31a7d3 Update new consent screen for fingerprint
- Move top description into subtitle for landscape mode
- Update the button text

Bug: 177591560
Test: robotest and visual verified
1) Settings -> Security -> Fingerprint
2) Rotate the device and check if the description is on the right side

Change-Id: Ie20597fce48f73aa83c5d637682db1860c384a7a
2021-03-05 15:53:01 +08:00
TreeHugger Robot
d9fe64bec6 Merge "Remove enroll animation from touch sensor page" into sc-dev 2021-02-22 06:25:04 +00:00