Commit Graph

376 Commits

Author SHA1 Message Date
TreeHugger Robot
493db88bf4 Merge "Fix landscape to reverse landscape issue" into sc-dev 2021-07-02 23:49:36 +00:00
Mill Chen
7f2496219f Fix landscape to reverse landscape issue
Fingerprint enrollment page needs to display different types of layout
for both landscape mode and reverse landscape mode. However
onConfigurationChanged doesn't get called when landscape mode rotates to
reverse landscape mode directly, that causes it displays a wrong layout
in the both landscape and reverse landscape modes.

Trying to monitor rotation event and checking if the case that directly
turns landscape mode to reverse landscape mode happens, if so, reCreate
method will get called to re-lay out the page. There will be a flicker
problem happening in re-laying out the page but this solution still
works for users to have the correct layout.

Fix: 186372522
Test: manual test
1) Navigate to fingerprint enrollment page
2) Rotate the screen from landscape mode to reverse landscape mode
3) Observe the page and see if it has a correct layout

Change-Id: Ie94f43a6546f453c10ae9f1c3ba83e1178784950
2021-07-03 06:40:25 +08:00
TreeHugger Robot
59b82fad2f Merge "Only launchHandoffToParent in SUW" into sc-dev 2021-07-02 20:14:33 +00:00
Kevin Chyn
c702e1bfba Only launchHandoffToParent in SUW
Settings flow does not need to show this screen

Fixes: 192586840
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true --ez skip_return_to_parent <true/false>
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Test: atest com.android.settings.biometrics.ParentalConsentHelperTest

Change-Id: Ic2edbb5ec9693d05c89206d49249f59fd968aa2f
2021-07-02 12:04:06 -07:00
Joshua Mccloskey
f68524f421 Merge "Refactored bad_calibration string" into sc-dev 2021-07-02 14:14:09 +00:00
TreeHugger Robot
65c9b03fb5 Merge "Fix multiple biometrics enrollment flow" into sc-dev 2021-07-02 05:26:18 +00:00
Mill Chen
e24255fe7e Fix multiple biometrics enrollment flow
Suppose both face auth and fingerprint auth exist in a device, the setup
flow will skip fingerprint enrollment when a user skips to register
face data on the face enrollment education page. Updated the skip button
method and make the flow move on to fingerprint enrollment if a use
doesn't want to register face data.

Fix: 186084024
Test: manual verified
1) Reset device and start from SUW
2) Press skip button on the face unlock education page
3) The next flow should be fingerprint enrollment intro page

Change-Id: I037ae68f39f5fdbf62ea95b998621c7f7df31b43
2021-07-01 14:45:33 +08:00
Joe Bolinger
47e8ddbdb9 Prevent finishing early on single sensor devices.
Fixes regression from commit c358adad56.

Fix: 192420564
Fix: 188847063

Test: manual enroll face & fingerprint via setup wizard (on fp, face, & fp+face device variants)
Change-Id: If7027e4d0ddf9d73daf91f174f237e4eb1621ea7
2021-06-30 14:21:04 -07:00
Joe Bolinger
c17876365a Revert "Revert "Return enrollment consent status to caller.""
This reverts commit c358adad56.

Reason for revert: Applying original change with additional change for single sensor devices.

Bug: 192420564
Bug: 188847063

Test: manual enroll face & fingerprint via setup wizard (on fp, face, & fp+face device variants)

Change-Id: Idfaaa2b6f4611056f9999325bac8401e28a7510b
2021-06-30 14:16:56 -07:00
Joe Bolinger
a86c8be5fa Merge "Revert "Return enrollment consent status to caller."" into sc-dev 2021-06-30 20:10:58 +00:00
Joshua Mccloskey
b182a4fb5c Refactored bad_calibration string
Test: Manual
Bug: 192105305
Change-Id: I82b0965459537c940b269636b8277af89b5ad284
2021-06-30 09:16:20 -07:00
bsears
c358adad56 Revert "Return enrollment consent status to caller."
This reverts commit eb1dac69f0.

Reason for revert: Based on bisection, this CL is the root cause for bug 192420564, which breaks Setup Wizard.

Bug: 192420564
Change-Id: I8d9aee7fe2415e134fcc981b0548bd9ce300db55
2021-06-30 14:53:13 +00:00
TreeHugger Robot
ca61c3919e Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev 2021-06-29 22:20:03 +00:00
Curtis Belmonte
218187bcce Fix buttons and icons for fingerprint enroll intro
Updates the labels of buttons and the colors of icons shown on the
fingerprint enroll intro screen to be consistent with the face enroll
intro screen and match the latest mocks.

Note that this commit removes some unused strings but does not add any
new ones requiring l10n.

Test: Manually tested face enroll from Setup Wizard and Settings

Fixes: 192381823
Change-Id: Id991d4f29d6de82acd538f1853bc8a5e50cd2637
2021-06-29 14:05:27 -07:00
Jan Tomljanovic
2b8678c5d4 Merge "Enable controllers to use a custom key." into sc-dev 2021-06-29 16:02:55 +00:00
Joe Bolinger
eb1dac69f0 Return enrollment consent status to caller.
Bug: 188847063
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Change-Id: I3285b379e175539c37355c67749c3d900e6ac62b
2021-06-28 17:51:46 -07:00
Jan Tomljanovic
c6667337ca Enable controllers to use a custom key.
Test: atest SettingsUnitTests
Test: m -j45 RunSettingsRoboTests
Bug: 191763369
Change-Id: I48eea95613600580c80c8850f0a3fd543a7e0a43
2021-06-25 15:35:53 +01:00
Curtis Belmonte
147fa2f159 Merge "Fix face education UX for both grid and traffic light" into sc-dev 2021-06-24 00:57:31 +00:00
Curtis Belmonte
d3a07c29bf Fix face education UX for both grid and traffic light
Makes the following adjustments to the UI of the Face Unlock education
screen for both the grid and traffic light enrollment flows:
- Fixes issues with text being overlapped by illustrations
- Prevents views from moving vertically due to state changes
- Ensures no scroll is required for default locale and scaling
- Adjusts the color and content of the a11y setup toggle

Test: Manual:
1. Start grid-based face enrollment (e.g. from Settings > Security)
2. Proceed to "How to set up Face Unlock" screen
3. Tap "Setup for limited vision or head motion"
4. Toggle "Setup for limited vision or head motion" switch off and on
5. Repeat steps 1-4 for traffic light face enrollment

Fixes: 191105436
Fixes: 191317385
Change-Id: Ie80f5b3130b5b0aeceb889f53cc2dec8c7423e47
2021-06-23 16:14:40 -07:00
Joshua Mccloskey
be845d1541 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev 2021-06-21 20:41:01 +00:00
Joe Bolinger
daeda0525b Merge changes from topic "unicorn-hand" into sc-dev
* changes:
  Add new enum for parental consent UI.
  Add handoff activity to parental consent flow.
2021-06-21 17:06:29 +00:00
TreeHugger Robot
b5b519dd85 Merge "Remove the duplicated skip lock screen setting" into sc-dev 2021-06-21 07:54:30 +00:00
Joe Bolinger
2976b9bc14 Add new enum for parental consent UI.
Bug: 188847063
Test: manual
Change-Id: I7b101f0d7cda415695ecdb7963a0e514c875b95c
2021-06-18 13:30:23 -07:00
Joshua Mccloskey
3bd11c302a Added fp_bad_calibration to fp enrollment.
Test: Verified error message shows during enrollment.
Bug: 189133688
Change-Id: Ib1b47f5fff16d801b88247cc01a32de88c2ecd66
2021-06-18 11:49:55 -07:00
Joe Bolinger
fb515ed608 Add handoff activity to parental consent flow.
Bug: 188847063
Test: manual
Change-Id: Ib6f38aae487a536fb8e85d608a22378a17c1bc64
2021-06-18 10:35:35 -07:00
Joe Bolinger
0fcac8bf0d Merge changes from topic "unicorn-1" into sc-dev
* changes:
  Update strings for parental consent flow in setup wizard.
  Add plumbing and placeholder screens for parental consent flow.
2021-06-18 16:28:27 +00:00
Joe Bolinger
4af5a3644d Update strings for parental consent flow in setup wizard.
Bug: 188847063
Test: manual
Change-Id: I044be874818f6563a47c3f7c8c5011b3cab31ae9
2021-06-17 14:53:56 -07:00
Kevin Chyn
678a57b0df Merge changes from topic "kchyn-unicorn4a" into sc-dev
* changes:
  Show biometric-specific dialog when appropriate
  Add biometric strings to DeviceAdminStringProviderImpl
2021-06-17 01:27:00 +00:00
Joe Bolinger
a8808f7368 Add plumbing and placeholder screens for parental consent flow.
Bug: 188847063
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Test: atest com.android.settings.biometrics.ParentalConsentHelperTest
Change-Id: Ie136036d5f550775fd0b021979581a5d222f1b68
2021-06-16 09:58:19 -07:00
Kevin Chyn
826df7ae78 Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev 2021-06-16 07:55:01 +00:00
Kevin Chyn
44a0ddaa4c Merge "Update to use ParentalControlsUtilsInternal for common logic" into sc-dev 2021-06-16 06:13:17 +00:00
Kevin Chyn
24b81dcffb Merge "Convert biometrics to RestrictedPreference" into sc-dev 2021-06-16 06:13:04 +00:00
Kevin Chyn
0c34d259a0 Show biometric-specific dialog when appropriate
1) We need to pass a "restriction" string from settings to the dialog,
   otherwise the biometric dialog could be shown in non-biometric
   flows
2) Updates ActionDisabledByAdminDialogHelper to pass the restrition
   to be taken into consideration when creating the controller
3) Sets an optional onClickListener on the positive button.

Bug: 5788943
Test: atest ParentalControlsUtilsTest
Change-Id: Iedff7fef50e186b2779f061f37d3080c910d2179
2021-06-15 20:57:26 -07:00
Kevin Chyn
add8de49e9 Move testAlwaysRequireConsent to frameworks/base
Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I1c374b0e0e051a2e911d4586f7f2f9928c9de260
2021-06-15 19:58:47 -07:00
Kevin Chyn
ee3ca1506a Update to use ParentalControlsUtilsInternal for common logic
Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I14ba3683f846ad7ff6e9f2eb5013d9033556e706
2021-06-15 19:58:41 -07:00
Kevin Chyn
9af27677e9 Convert biometrics to RestrictedPreference
Bug: 188847063
Test: adb shell settings put secure com.android.settings.biometrics.ParentalControlsUtils.always_require_consent 1
      Preference becomes gray with an info icon
Test: atest ParentalControlsUtilsTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=FingerprintStatusPreferenceControllerTest
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=FaceStatusPreferenceControllerTest

Change-Id: I929c11606eec76063f7b060fdc5cb2b5f60a80e2
2021-06-15 19:57:04 -07:00
Joshua Mccloskey
19baf0df84 Merge "Update multi biometric flow for SUW" into sc-dev 2021-06-16 00:07:16 +00:00
Joshua Mccloskey
785203d51a Update multi biometric flow for SUW
Currently, if a user has completed a fingerprint/face enrollment
in SUW and they press the back button, we show the UI for each, and
it fails with no error.

This change makes it so that if a user completes 1 fingerprint or 1
face enrollment, it will no longer try and enroll them again if they
have failed.

Test: Manual
Bug: 191073296
Change-Id: I020c423b5d34797cd7c8be66a2e24051135c9be0
2021-06-14 19:59:23 -07:00
Curtis Belmonte
e301d59536 Fix face/fingerprint consent primary footer button logic
Currently, the primary footer button on the face and fingerprint enroll
consent pages reads "I agree" even before the user has scrolled to the
bottom of the screen. This commit fixes the issue so that "More" is
displayed until the user scrolls to the bottom. The remaining logic is
left intact.

Test: Manual:
1. Start face or fingerprint enrollment
2. Confirm primary button shows "More" and secondary button is hidden
3. Press the "More" button or scroll to the bottom of the screen
4. Ensure primary button shows "I agree" and secondary shows "No thanks"

Fixes: 189268868
Change-Id: I02fa47d1de83bd5b5d82c733495ae579cbd2d6c6
2021-06-10 16:38:11 -07:00
Mill Chen
491bc21fd4 Remove the duplicated skip lock screen setting
Fix: 187366696
Test: robotests
Change-Id: I063ef7c1a43e16aee6d141389896cadecfd3738f
2021-06-10 14:20:44 +08:00
Joshua Mccloskey
e80c5cddd2 BiometricEnrollIntroduction button update
No longer show the "No thanks" button until the user has
scrolled to the bottom of the introduction text.

This applies for both face and fingerprint enroll introduction screens.

Fixes: 189268868
Test: Manual
Change-Id: I0ccf6ae1d329df06f769f05288706ef22183bc21
2021-06-08 22:25:16 -07:00
Curtis Belmonte
58864ddc54 Merge "Set background of all face enroll status/footer bars" into sc-dev 2021-06-08 02:06:55 +00:00
Curtis Belmonte
f13d5d5344 Set background of all face enroll status/footer bars
Moves the logic for setting an explicit background on the status and
footer bars shown during face and fingerprint enrollment from
BiometricEnrollIntroduction to BiometricEnrollBase. This ensures that
the status and footer bars on all biometric enroll screens will have
their backgrounds set, preventing the screen content from showing
through.

Test: Manual

Fixes: 190138494
Change-Id: If5050d07d277f51c784daecf80d5e3cdeae0ba49
2021-06-07 15:54:26 -07:00
Curtis Belmonte
2968c05f31 Merge "Apply SUW theme to add/remove button in face settings" into sc-dev 2021-06-07 22:49:52 +00:00
Curtis Belmonte
7dbe83ef5a Apply SUW theme to add/remove button in face settings
Update the button to "Set up Face Unlock" or "Delete face model" shown
on the Face Unlock Settings screen to match the primary button theme
used in Setup Wizard.

Test: Manual

Fixes: 190422391
Change-Id: Ib864cb53f366eec7d1a69c2808d7effc8a0aa05a
2021-06-07 14:02:58 -07:00
Kevin Chyn
47257c05c8 Remove SUW-specific fingerprint enroll description
Bug: b/187460696
Test: adb shell am start -n com.google.android.setupwizard/.SetupWizardTestActivity
Change-Id: I5db49dd27439445aae9819dbdd0728ac5c02f0cd
2021-06-04 12:47:35 -07:00
Yi-Ling Chuang
9312dc83fa Apply sliding transition to biometric settings
Bug: 187542491
Test: rebuild
Change-Id: Ife645785a37c4ac838204d0613dffd5a5911a47e
2021-06-04 15:49:43 +08:00
Kevin Chyn
ef963fe079 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev 2021-06-02 20:03:38 +00:00
Kevin Chyn
3d20bf93fd Fix array out of bounds in BiometricEnrollActivity
Bug: 189876828
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Change-Id: I89f8ea1353cd9243c20c6184d579707da27e7b6f
2021-06-02 09:40:51 -07:00
Curtis Belmonte
af149b11fc Fix biometric content overlap with top/bottom bars
Sets a solid background for the status and footer bar shown on each of
the biometric enroll introduction screens, to prevent the content from
showing through.

Test: Manually tested face and fingerprint enrollment

Fixes: 189075189
Change-Id: I1a41dc911c5ac7ded94e33b25a9c0e990e93ba3f
2021-06-01 18:11:12 -07:00