Commit Graph

481 Commits

Author SHA1 Message Date
Joshua Mccloskey
0902b44744 Added lottie animations for udfps side/tip
Bug: 209807883
Test: Verified animations show for multiple devices.
Change-Id: Ic63a0eca226309b92aa64cb4f80791ef179b8154
2022-01-14 07:30:08 +00:00
Joe Bolinger
6f35ae6fcb Update remove face enrollment strings for convenience. am: 493e889dd6 am: a0fcc6e18e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16433461

Change-Id: Id17a7dede2acc2d5b7824100a98fb3adc1f3ba2f
2021-12-09 21:41:16 +00:00
Joe Bolinger
a0fcc6e18e Update remove face enrollment strings for convenience. am: 493e889dd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16433461

Change-Id: Ib3901ce16b07b3ee5d8554cc62acae5bbf4a76d6
2021-12-09 21:23:35 +00:00
Joe Bolinger
493e889dd6 Update remove face enrollment strings for convenience.
Fix: 209877102
Test: manual (enroll & delete)
Change-Id: Idb3a8d3622574edc47673e8fe6a72a5b9d449c7b
2021-12-09 19:24:27 +00:00
Joe Bolinger
ad86e310c9 Merge "Update biometrics OWNERS." am: fe99de597e am: 7c939b9e4f am: 687bccdd6f am: ecb88bace4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1901117

Change-Id: I4161bb84f1528ec10df95cbfe4eebb760d2b7ea0
2021-12-08 23:56:04 +00:00
Joe Bolinger
ecb88bace4 Merge "Update biometrics OWNERS." am: fe99de597e am: 7c939b9e4f am: 687bccdd6f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1901117

Change-Id: I871c18cedf70a2cd608b1401fee7f1a139a675f0
2021-12-08 23:30:58 +00:00
Joe Bolinger
7c939b9e4f Merge "Update biometrics OWNERS." am: fe99de597e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1901117

Change-Id: I8cd2a34eed6b830896d1370b877dbfdac15221a8
2021-12-08 18:37:58 +00:00
Joshua Mccloskey
db1feef7e0 Merge "Added sensorPrivacyDialog to face settings" into sc-v2-dev am: af87b942f6 am: 73d9752eea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276448

Change-Id: I15d3315caa8fe1efcff53f1cdd008b0d64364a83
2021-12-08 07:41:12 +00:00
Joshua Mccloskey
73d9752eea Merge "Added sensorPrivacyDialog to face settings" into sc-v2-dev am: af87b942f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276448

Change-Id: I94b47b11890b5e7751fad60378128f1f2ee17802
2021-12-08 07:26:21 +00:00
Joshua Mccloskey
af87b942f6 Merge "Added sensorPrivacyDialog to face settings" into sc-v2-dev 2021-12-08 07:01:57 +00:00
Joshua Mccloskey
cc179be29f Merge "Fixed face enroll intro button issue" into sc-v2-dev am: 506c6b804f am: 78ab60db84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16365598

Change-Id: Ic324c6829d8dfa180ca7e0aaf5d8841c0e76dd88
2021-12-01 23:43:01 +00:00
Joshua Mccloskey
78ab60db84 Merge "Fixed face enroll intro button issue" into sc-v2-dev am: 506c6b804f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16365598

Change-Id: I2236768c62d8a8b48a4b4348b5e02bb7beb3c31f
2021-12-01 23:25:22 +00:00
Joshua Mccloskey
506c6b804f Merge "Fixed face enroll intro button issue" into sc-v2-dev 2021-12-01 23:08:49 +00:00
Joshua Mccloskey
3d5c9011f0 Merge "Disable setting if sensor is convenience." into sc-v2-dev am: 1ca42ffc79 am: e372b2a22b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16233490

Change-Id: I32ecd37e6f3937a845ee2637b9774455a8bac81b
2021-12-01 18:08:55 +00:00
Joshua Mccloskey
e372b2a22b Merge "Disable setting if sensor is convenience." into sc-v2-dev am: 1ca42ffc79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16233490

Change-Id: I9a4e565b311d7a65091aca5294879366b9399265
2021-12-01 17:19:04 +00:00
Joshua Mccloskey
1ca42ffc79 Merge "Disable setting if sensor is convenience." into sc-v2-dev 2021-12-01 17:09:50 +00:00
Joshua Mccloskey
756fa20e1c Fixed face enroll intro button issue
Fixed an issue where sometimes after completing face authentication the
more & agree buttons would display instead of the done button.

1. Enter SUW
2. Complete face authentication flow
3. Go to next step (finishing the Biometric flow)
4. Press the back button
5. Observe that the text now says "Done"

Fixes: 205203673
Test: Verified button text is changed as expected during SUW.
Change-Id: I5cfad265f9b27669dcad64e5872750695b1b5bdc
2021-11-30 09:29:13 -08:00
Joshua Mccloskey
b73201c6be Added sensorPrivacyDialog to face settings
Test: Verify flow presents dialog if the privacy setting is enabled.
Bug: 201045056
Change-Id: I96f14db457311d13f07c770ff0993581576c5dba
2021-11-29 23:09:16 -08:00
Joe Bolinger
54b4689e5a Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b am: 77556bcc51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466

Change-Id: I9c84fbac19a764c012168110db04832a4bf58e92
2021-11-29 23:46:30 +00:00
Joe Bolinger
77556bcc51 Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466

Change-Id: I08041af311deb454a3f05b9328955b6489a8f35a
2021-11-29 23:26:27 +00:00
Joe Bolinger
78e700fd31 Update biometrics OWNERS.
Test: N/A
Change-Id: Ia9e71da5fd13b46c3a897b8aabaca0865b3fb87c
2021-11-23 15:36:53 -08:00
Joe Bolinger
d00fd7f362 Remove face auth from setup wizard when configured as a convenience.
Fix: 206867696
Test: manual (enroll via SUW with/without unicorn)
Change-Id: I41bf7488cf30ffe3e0d09282e923347c7f5938df
2021-11-23 00:59:31 +00:00
Joshua Mccloskey
e711b3277e Disable setting if sensor is convenience.
This change disables the FaceSettings Confirmation setting if a
sensor is convenience. This is due to the fact that convenience strength
sensors can't be used by BiometricPrompt (so this setting has no
effect.)

Test: Verified this setting shows depending on whether or not the sensor
is convenience or not.
Fixes: 204137656

Change-Id: I88daf9f12b76d06697275161385f463fb88e0f3a
2021-11-22 13:49:17 -08:00
TreeHugger Robot
e4dca4c6db Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a am: 2fc75eba80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888

Change-Id: Ib2df8aa1538faf51d375dc92cc978039f0da9768
2021-11-18 03:52:25 +00:00
TreeHugger Robot
2fc75eba80 Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888

Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768
2021-11-18 03:41:27 +00:00
TreeHugger Robot
b84b7d586a Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev 2021-11-18 03:25:05 +00:00
Kevin Chyn
156db33a56 Disable combined controller only if all modalities require consent
Additionally, ensure that consent is only requested for modalities
that have not been previously consented to. We retrieve the consent
requirement (which come from DPM) in onActivityResult instead of
onCreate, since the signal may not be ready immediately.

Fixes: 196060286
Fixes: 204592495
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest

Change-Id: I984e61f28ffbf957c16cac4ea84f40b6ad7d8ae9
2021-11-16 12:32:56 -08:00
TreeHugger Robot
f1a30d7696 Merge "Revert "Revert "Update animation for fingerprint edu page""" into sc-v2-dev am: c0cca5c474 am: b9e7e27808
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183660

Change-Id: If0ab56798b36847ccf932b7f7a5b576db7669609
2021-11-15 20:12:45 +00:00
TreeHugger Robot
b9e7e27808 Merge "Revert "Revert "Update animation for fingerprint edu page""" into sc-v2-dev am: c0cca5c474
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183660

Change-Id: Id40079bcd0dfc07725fd4a3fb5201cae93f6135a
2021-11-15 19:58:30 +00:00
Mill Chen
e6554d23a5 Revert "Revert "Update animation for fingerprint edu page""
This reverts commit ba0a012b57.

Fix: 204719520
Test: Settings should not crash when entering fingerprint edu page
Change-Id: If79fc50bbd6b198e7fccc52fce66c27cf3761d6d
2021-11-11 11:18:41 +08:00
Jason Chiu
d13834de52 Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600 am: 56dde819dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: Ife6c9bbe5433a818d42bf91509160fea8ae924f8
2021-11-03 07:05:55 +00:00
Jason Chiu
56dde819dc Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: I6a3448e6e54666b45f6f67288593034a03d50d64
2021-11-03 06:54:55 +00:00
Jason Chiu
9fc0f18181 Define a constant Sliceable#NO_RES for no resource cases
Fix: 204733076
Test: build
Change-Id: Ifa3b9db0e915a3ec056ad68a9a1862811594d423
2021-11-03 12:23:49 +08:00
Jason Chiu
7f6b9e26c9 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
2021-11-02 02:43:42 +00:00
Jason Chiu
026b1b5df6 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
6821b6be32 Merge changes from topic "slice-highlight" into sc-v2-dev
* changes:
  Add highlight menu keys for all toggle pref controllers and custom slices
  Support slice deep links highlighting menu entries
2021-11-02 02:14:09 +00:00
TreeHugger Robot
5aa5035a9b Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev am: faf0721f2c am: cdf991a7ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16167410

Change-Id: I5676cec612866c434204bbc6f548415a2508bbb6
2021-11-01 22:04:07 +00:00
TreeHugger Robot
cdf991a7ba Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev am: faf0721f2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16167410

Change-Id: Iea2d9bad655ee100c9aba65310307e8c988cfa7e
2021-11-01 21:52:44 +00:00
TreeHugger Robot
faf0721f2c Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev 2021-11-01 21:37:29 +00:00
Daniel Chapin
ba0a012b57 Revert "Update animation for fingerprint edu page"
Revert submission 16091075-update_lottie_fp_edu

Reason for revert: Droidfood Blocking Bug: 204719520
Reverted Changes:
I0c3b1ad93:Update animation for fingerprint edu page
Id07ee17fa:Update animation for fingerprint edu page

Change-Id: I0f301491c2b526443a40b916ac2d98093d80a759
2021-11-01 19:36:00 +00:00
Jason Chiu
2989c50a23 Add highlight menu keys for all toggle pref controllers and custom slices
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
2021-11-01 15:00:18 +08:00
TreeHugger Robot
c8c3f5c9b4 Merge "Update animation for fingerprint edu page" into sc-v2-dev am: 4b40fa5016 am: c5230ce87e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091075

Change-Id: I3375ef423097e7bad8f1fba5d657fec23908eea8
2021-10-29 18:54:13 +00:00
TreeHugger Robot
c5230ce87e Merge "Update animation for fingerprint edu page" into sc-v2-dev am: 4b40fa5016
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091075

Change-Id: I177a51b2c06b2cf4c8a385016b3b091a73a1c357
2021-10-29 18:42:32 +00:00
TreeHugger Robot
4b40fa5016 Merge "Update animation for fingerprint edu page" into sc-v2-dev 2021-10-29 18:24:18 +00:00
Joshua Mccloskey
7571e874f7 Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe156c am: 23e3603e69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16103499

Change-Id: Iea31095d21a01ef5847ae009331251f1e1df10a5
2021-10-26 18:24:43 +00:00
Joshua Mccloskey
23e3603e69 Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe156c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16103499

Change-Id: I46e6989e1e50718b09263d2d24c16105276016a9
2021-10-26 18:05:13 +00:00
Mill Chen
dc4ec9bfca Update animation for fingerprint edu page
Bug: 197264655
Test: visual verify
1) Navigate to fingerprint unlock and start fingerprint enrolling flow
2) Observe the education page and see if the animation works

Change-Id: Id07ee17fac29f8f49babb137889e50514ec86326
2021-10-26 15:16:50 +08:00
Joshua Mccloskey
f0a55f7c4e Fixed bug causing user to be stuck on face intro
Test: See below
Fixes: 203375738
Change-Id: I3e59191a8c936c7c7a3d8561e908593dbf9710b5

1. Enrolled a face during SUW
2. Pressed back on fingerprint enroll intro
3. Verified that the next button's text is chnaged to done
4. The done action launches the fingerprint enroll intro flow.

Change-Id: Id5d652257445e40426ade3d396a31ebf936cc348
2021-10-25 15:08:51 -07:00
Joshua Mccloskey
b7e97e4f58 Merge "Tap fp find sensor animation goes to next page." into sc-v2-dev am: 3efe6e59f7 am: cadd832d42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047402

Change-Id: I473d44013c0d82e3c3ede0728b526015b6177b48
2021-10-15 21:32:16 +00:00
Joshua Mccloskey
cadd832d42 Merge "Tap fp find sensor animation goes to next page." into sc-v2-dev am: 3efe6e59f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047402

Change-Id: Ic5127cedcc35fa8b51ea0df9088d1eba132b52ed
2021-10-15 21:14:27 +00:00