Commit Graph

127 Commits

Author SHA1 Message Date
lbill
88cf7037b0 [Screen off unlock UDFPS] Fingerprint Settings integration 2/2
1. Integrate FingerprintSettings with Toggle
2. Sync the Toggle state with SettingProvider key
   "screen_off_unlock_udfps"

Reference: go/udfps-aof #Settings UI design(Deck)

Bug: 373792870
Bug: 369939804
Bug: 369938501
Flag: android.hardware.biometrics.screen_off_unlock_udfps
Test: atest FingerprintSettingsFragmentTest
    atest DevelopmentSettingsDashboardFragmentTest
    atest FingerprintSettingsUnlockCategoryControllerTest
    atest FingerprintSettingsScreenOffUnlockUdfpsPreferenceControllerTest
Test: adb shell settings put secure
      screen_off_unlock_udfps <1|0>
Change-Id: I03794f53684bfb60b4a854e14507e67f60c55a7d
2024-10-30 02:29:43 +00:00
Treehugger Robot
540ce288ad Merge "(3/N) Biometric error dialog" into main 2024-09-18 00:20:40 +00:00
Diya Bera
fc711494b9 (3/N) Biometric error dialog
Add an error dialog to help user recover from biometric error for
for identity check for enrollment, changing LSKF and accessing
biometrics settings

Flag: android.hardware.biometrics.flag.mandatory_biometrics
Bug: 358641110
Bug: 358179610
Test: Manual
Change-Id: Iaf1986d3c1892b6158808bc3ded96145f410dc62
2024-09-17 20:25:01 +00:00
MiltonWu
694fe0751a Customize Fingerprint enroll activities
Provide an interface for ODM/OEM to override Fingerprint enrollment
activities.

Bug: 364794493
Flag: EXEMPT can't apply flag for manifest change
Test: atest SettingsRoboTests:FingerprintEnrollTest
Change-Id: Ic519970a3837614b3d4c8cb2f6d75967ae838208
2024-09-09 14:49:09 +00:00
Diya Bera
92ea474b86 Add mandatory biometric prompt to platform surfaces (5/N)
1. For biometric settings, request biometric prompt only after
   successful credential verification and no auth request after
   enrollment

2. Differentiate between mandatory biometrics ineffective error and
   other biometric errors

Flag: android.hardware.biometrics.flags.mandatory_biometrics
Bug: 358176202
Bug: 358179610
Test: atest UtilsTest DevelopmentSettingsDashboardFragmentTest MainClearTest BuildNumberPreferenceControllerTest CombinedBiometricProfileSettingsTest
Change-Id: I778dd5403dd5ab64d8cc39bd88b22c4d39182e94
2024-08-13 04:21:37 +00:00
Joshua McCloskey
7f26cdbb4a Added haptic feedback in fingerprint settings auth
Test: Verified manually that the haptic vibration occurs
Fixes: b/296887919
Flag: EXEMPT bugfix
Change-Id: I34c71701b662ec7f6fb655eeb395bbe1d5d5754b
2024-08-07 17:52:45 +00:00
Joshua McCloskey
ed59922ca8 Remove face/fignerprint search if not present
Test: Verified manually with a device that if face/fingerprint are not
present they do not show up.
Fixes: 350599580
Flag: EXEMPT bugfix

Change-Id: I6a691d2985e4839336e9c08dfa6c97abe23f43f2
2024-07-30 18:14:41 +00:00
Diya Bera
c5e36291ab Merge "Hide background when identity check auth is requested" into main 2024-07-29 16:57:35 +00:00
Joshua McCloskey
1d9ea3fbe8 Update preferences after a fingerprint is removed.
Test: Manually verified preferences are removed.
Fixes: 355572367
Flag: EXEMPT bugfix
Change-Id: I14a09b67b8be3cbe0c5d46a959a29c333c46a872
2024-07-26 22:00:30 +00:00
Diya Bera
31ec11f0b6 Hide background when identity check auth is requested
Flag: android.hardware.biometrics.flags.mandatory_biometrics
Fixes: 354014097
Test: atest UtilsTest
Change-Id: I3af06fd9dca2bdc306496f1db832e1d1e2bfe8d2
2024-07-25 17:00:05 +00:00
Diya Bera
9bae71c15c Add mandatory biometric prompt to platform surfaces (3/N)
Pass user ids for identity check. This is to make sure that the right
user is requested auth for different profiles.

Flag: android.hardware.biometrics.Flags.MANDATORY_BIOMETRICS
Bug: 339910718
Test: atest UtilsTest
Change-Id: I953b56e9bfd1edd49d080124905d42a23247b7a7
2024-07-23 04:07:08 +00:00
Joshua Mccloskey
51bb0fe4e4 Merge "Added new fingerprint metric categories." into main 2024-07-22 17:35:20 +00:00
Joshua McCloskey
f624d6adf7 Refresh templates when fp removal fails
Test: atest
Fixes: 339556796
Flag: EXEMPT bugfix
Change-Id: I369e37f170a57bc9ced98f9728d06f2072c01263
2024-07-22 17:33:03 +00:00
Joshua McCloskey
d779dd0b70 Added new fingerprint metric categories.
Test: Manual
Fixes: 260072451
Flag: EXEMPT bugfix
Change-Id: I122025dbe7125da4b602ab100eb2fc8130584d2e
2024-07-18 17:59:35 +00:00
Vincent Wang
8d235a2fc8 Merge "Remove package biometric2 from AOSP settings" into main 2024-07-15 05:00:06 +00:00
Vincent Wang
e9c4adfaf1 Remove package biometric2 from AOSP settings
Flag: EXEMPT Remove legacy code from AOSP
Bug: 351977012
Test: Build pass
Change-Id: I2285ab8cc2776071c329d7432849aeffc28ed8ee
2024-07-11 00:06:41 +00:00
Treehugger Robot
62db4b3a4d Merge "Add mandatory biometric prompt to platform surfaces (1/N)" into main 2024-07-02 02:50:08 +00:00
Diya Bera
049de84f2d Add mandatory biometric prompt to platform surfaces (1/N)
1. Face settings
2. Fingerprint settings
3. Change device credential

Flag: android.hardware.biometrics.Flags.MANDATORY_BIOMETRICS
Bug: 339910718
Test: atest UtilsTest

Change-Id: I69778d1733ea9fb312e7c26ae0fa23b6008dde5d
2024-07-01 21:35:19 +00:00
Joshua Mccloskey
2d0638c76b Merge "Revert "Restart fingerprint auth on cancel."" into main 2024-06-26 00:09:29 +00:00
Joshua Mccloskey
16f973b836 Revert "Restart fingerprint auth on cancel."
This reverts commit 4efd4c16f9.

Reason for revert: Breaks auth behavior

Fixes: 347858844

Change-Id: Ie1b8be9dfae2cba7e2b37187f08cf1360aedf29f
2024-06-25 21:35:00 +00:00
josephpv
8f30977859 Update title in Face and Fingerprint settings for private space
Screenshots:
b/335748976#comment9

Bug: 335748976
Test: Manual
Change-Id: I3d99488f33177d4ac4aa2e4bb3c420604460ac72
2024-05-31 01:54:32 +00:00
josephpv
c5611bfbc1 Face and fingerprint unlock strings for private space
Recordings:
b/326399895#comment10

Bug: 326399895
Test: Manual
Change-Id: I9f4449439639c93a10475333a91059f855bce07b
2024-05-24 05:00:44 +00:00
Joshua Mccloskey
1b55eb8bfc Merge "Update face & fingerprint pref logic" into main 2024-05-08 18:08:06 +00:00
Joshua McCloskey
3e25356829 Update face & fingerprint pref logic
This change makes it possible for face & fingerprint settings to be
presented to the user only to delete their face/fingerprint if the
feature has been disabled by a device admin.

Bug: 323280069
Test: atest BiometricFaceStatusPreferenceControllerTest
BiometricFingerprintStatusPreferenceControllerTest

Change-Id: I62cab3ddf7cf708d1b0b4da61dc3ffb7052dee84
2024-05-07 18:12:41 +00:00
Joshua McCloskey
4efd4c16f9 Restart fingerprint auth on cancel.
Test: atest FingerprintSettingsFragmentTest
Fixes: 336572954
Change-Id: Ie64d509caf052271a141e466f5c840e92f5dc119
2024-04-29 22:30:23 +00:00
Joshua McCloskey
4a499bb9b2 Removed period from fp delete dialog.
Note that this removes the period from english & all translations,
DeleteFingerprintDialog & ConfirmLastDeleteDialog should be the same.

Test: Manual.
Fixes: 331758381
Change-Id: I774375ed575bfdfd3ec181d902a99d918596890c
2024-04-02 18:10:05 +00:00
Vincent Wang
d5b1bf7554 Fix Settings crash after clicking "Add Fingerprint"
Bug: b/331136606
Test: 1.Add 1 Fingerprint
      2. adb shell am start -a android.settings.FINGERPRINT_SETTINGS
      3. input correct pin/pattern/password
      4. Click Add Fingerprint cehck if Setting work correctly
Change-Id: I076ed7488729a24aea9b47a843b7785e128f6791
2024-03-26 02:09:28 +00:00
Vincent Wang
118abc5568 Show calibtation result in FingerprintSettings & EnrollEnrolling
if results are available

Bug: b/326155807
Test: Enroll multiple fingerprints and check if
        calibration isn't triggered.

Change-Id: I006db64f001fb70d2bb294a15a2d3efc77e2da25
Merged-In: I006db64f001fb70d2bb294a15a2d3efc77e2da25
2024-03-19 02:32:58 +00:00
Hao Dong
c9aaa73b51 Show split screen dialog on the introduction and enrolling page.
Revert ag/22361082 and ag/22460413, show the split screen dialog on
the introduction and enrolling page, instead of relying on the callers
to show the dialog.

Test: atest BiometricsSplitScreenDialogTest
Test: atest FaceEnrollIntroductionTest
Test: atest SetupFingerprintEnrollIntroductionTest
Bug: 299573056

Change-Id: Ieb106a4a623ad5ca0e6eb1633413df75767bef52
2024-02-01 08:36:04 +00:00
Wu Ahan
a9913cb74c Add SfpsRestToUnlockFeature to FingerprintFeatureProvider
Bug: 296179618
Test: manually
Test: SettingsUnitTests
Change-Id: I452610e2c2b36f56dc4ade1cea1a15fdc088211f
2024-01-16 02:15:33 +00:00
Joshua McCloskey
a900c1dd1b Fixed biometric setting crash.
Test: Verified test crashed without fix, and passed with fix
Test: atest FingerprintSettingsFragmentTest
Fixes: 315164185
Change-Id: I1d8ab32eef8578a6d35831aef46275a9732e497c
2023-12-07 22:12:44 +00:00
Hao Dong
f2d2de494d Add fingerprint name to delete button content description.
Test: atest FingerprintPreferenceTest
Bug: 308671557

Change-Id: I5a7d402835124a50fd1268745eca1e28c865dc18
2023-11-09 17:14:42 +00:00
Joshua McCloskey
abaa6b5d9a Fixed search index for fingerprint settings.
Test: Manually verified add-fingerprint works.
Fixes: 306516371
Change-Id: I9fea695210dfeaee5abedce8c2086c553bd54f9c
2023-10-25 18:59:03 +00:00
Chaohui Wang
15ca95a31b Migrate to TwoStatePreference
SwitchPreference and SwitchPreferenceCompat are both TwoStatePreference.

Using TwoStatePreference in Java will helps migration in the future.

Bug: 306771414
Test: manual - check Settings pages
Change-Id: I84e1d7b09451106797c2b23d127855c6976678ca
2023-10-23 09:28:57 +00:00
Chaohui Wang
2541381259 Fix references to resources for Settings
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
2023-08-08 01:56:05 +00:00
Wenhui Yang
8dc0353e2e Update learn more string for udfps fp settings am: c6c9d74f06 am: eb94624bcd am: b43ac30381
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551

Change-Id: I56361c4b37674c2f6fe8cf9bdbd5a3f90b87f121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 02:20:18 +00:00
Wenhui Yang
b43ac30381 Update learn more string for udfps fp settings am: c6c9d74f06 am: eb94624bcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551

Change-Id: Ibbdff74d2be55f961a9f91bcdc1f1278dc2bbaa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 01:37:57 +00:00
Wenhui Yang
c6c9d74f06 Update learn more string for udfps fp settings
Update the learn more message for udfps fingerprint unlock to make it
consistent with sdfps.

Fixes: 289167628
Test: manual (see bug)
Change-Id: Iac6edb1c176dab462c91e1bf6236dfe4d0988693
2023-07-21 02:36:24 +00:00
Hao Dong
59a4bf3565 Merge "Fix require on screen toggle on guest user." into udc-qpr-dev am: 800728a5a6 am: 7461036d68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23714620

Change-Id: I62554d897396b165f02bac58b0d1d9673a409033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 04:56:28 +00:00
Hao Dong
c9a99978f9 Fix require on screen toggle on guest user.
Bug: 286018876
Test: atest FingerprintSettingsFragmentTest
Change-Id: I432ffd3b8b32caeaf7ac8c6bc3c2ee2a0ee53a08
2023-06-23 00:32:32 +00:00
Treehugger Robot
7cfb668c56 Merge "[BiometricsV2] Fix fingerprintSettings not shown" 2023-06-14 04:39:57 +00:00
Grace Cheng
93e7803911 Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c am: f0614ef722 am: 2d5f43d7e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: I49c7ff8a9a2191ac8d001c89a41aa0d09a93bbf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 21:21:40 +00:00
Grace Cheng
2365ad895a Fix NPE in updateAddPreference
Update mAddFingerprintPreference to avoid NPE

Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 16:52:51 +00:00
Milton Wu
78e0f9de8a [BiometricsV2] Fix fingerprintSettings not shown
Fix "Fingerprint Unlock" page not show when 1st fingerprint is added
through biometrics v2 enrollment on a device w/ faceunlock

Do no check bundle is null or not during check activity result because
it may be null if callee activity doesn't need to pass anything back to
previous caller activity.

Bug: 286993437
Test: test this scenario on a fingerprint only device w/o v2
Test: test this scenario on a faceunlock device w/o v2
Test: test this scenario on a fingerprint only device w/ v2
Test: test this scenario on a faceunlock device w/ v2
Change-Id: Ic6168e73de378ecc1555808d4f0969f4c490a38d
2023-06-13 17:55:49 +08:00
Milton Wu
bc2dbee762 [BiometricsV2] Refine fingerprint activities
Seperate FingerprintEnrollmentActivity to another InternalActivity and
SetupActivity. InternalActivity is used for FingerprintSettings.
SetupActivity is used for setupwizard flow.

Bug: 284248001
Test: atest FingerprintEnrollmentActivityTest
Test: atest for biometrics/biometrics2 in unit tests
Test: settingRoboTest for biometrics
Change-Id: I9fb5dc34300060b9ccf857a3335b81a5d4bf5c7b
2023-05-25 06:25:58 +00:00
Hao Dong
755a67a931 Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
Merged-In: Ie4bc18bf245eb7a755862401c710d85381063ff9
2023-05-10 23:26:02 +00:00
Hao Dong
bb03fc355e Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." 2023-05-10 00:48:15 +00:00
Hao Dong
968c5fb6f0 Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
2023-05-09 21:32:44 +00:00
Grace Cheng
ec1bd37db0 Prevent NPE on deleting fingerprint in Settings
Gate all Settings FingerprintUnlockCategory logic on isSfps() check to prevent NPE

Fixes: 279866500
Test: Enroll 2+ fingerprints on a non-sfps device, delete fingerprint,
observe no crash

Change-Id: I040d498426e0f8efb789875eedeb7bcf44436149
2023-04-29 05:19:41 +00:00
Grace Cheng
54d1cfdae0 Fix flicker of “touch to unlock anytime” toggle
Fixes flicker of toggle by setting not visible when launching confirm
pin/pattern/password or enrollment prior to displaying
FingerprintSettings. Also cleans up FingerprintSettings and
security_settings_fingerprint.xml to better separate SFPS and non-SFPS
logic and rename methods for clarity

Test: (manual) navigate to sfps fp settings and observe toggle doesn’t flicker
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsUnlockCategoryControllerTest
Fixes: 263843645
Change-Id: Ide3a666fc31b926ac14645dc22d090f77d81f901
2023-04-27 00:29:09 +00:00