Commit Graph

969 Commits

Author SHA1 Message Date
Treehugger Robot
2200654a7b Merge "Fix crash after confirmLock" into udc-qpr-dev am: 611e43fe05 am: b5195183cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24351353

Change-Id: Ie9c54fddcb4344051fc492a23bf7102214f10b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 03:29:46 +00:00
Chaohui Wang
8e2ae547d6 Clean up FeatureFactory.getFeature()
Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
2023-08-08 08:41:48 +00:00
Milton Wu
432560177c Fix crash after confirmLock
Stop everything in generateChallenge() on "Face and Fingerprint Unlock"
page if activity is null or finishing

Also fix ignored test cases in CombinedBiometricProfileSettingsTest

Bug: 292125215
Test: RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricProfileSettingsTest
Change-Id: I7a272e813bfddd5d066417a74cbd63d22f511000
2023-08-08 07:04:04 +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
Bill Lin
41e2f9c1c0 Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev am: c8eb80bcc2 am: f71d183d0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24175645

Change-Id: Ice5e79a72872009b5f1f90faf8bf9b02854c40d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 02:40:33 +00:00
Bill Lin
c8eb80bcc2 Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev 2023-07-25 01:30:28 +00:00
lbill
a851e68272 Fix no vibration when enroll init stage after receive onEnrollmentHelp
Change the behavior of vibration when
1. Init stage, don't vibrate if onEnrollmentHelp invoke
2. Then next enroll progress update, should vibrate

Note: This onEnrollmentHelp is invoked by FINGERPRINT_ACQUIRED_PARTIAL

Test: Should vibration when the progress 1st indicating after lightly press
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 290723009
Change-Id: Ie056aac8b3251fb3da6dccd95254fb30628fa65e
2023-07-24 07:23:12 +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
8b29400717 Update learn more string for udfps fp settings am: c6c9d74f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551

Change-Id: Ia0c854ca05bd17b4cd25d100010d831cc3052afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 00:53:10 +00:00
Vincent Wang
cd4b4f10cb Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev am: 11b9933fea am: 2b255a1f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24074845

Change-Id: I1da62994914c93695cf34feabdb527b8644b327f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 04:06:50 +00:00
Vincent Wang
11b9933fea Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev 2023-07-21 03:32:32 +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
Joshua Mccloskey
eb7692e052 Merge "Implement basic Fingerprint functionality." into udc-qpr-dev am: 1412f391d5 am: 22b67802f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23480676

Change-Id: I981accee2b7f0f3742c98d1b352d3076d421dede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 17:28:29 +00:00
Joshua Mccloskey
1412f391d5 Merge "Implement basic Fingerprint functionality." into udc-qpr-dev 2023-07-18 16:16:52 +00:00
Vincent Wang
91d6df7d60 Remove ignore annotation @Ignore("b/282413778")
Use FaceUdater.enroll to avoid Proguard remove this method

Bug: 291194547
Test: atest FaceUpdaterTest
Change-Id: I3b0c5557c4b4ebab6828fae831697a2b1a4daea5
2023-07-18 08:07:09 +00:00
Vincent Wang
291714418c Fix enroll introduction page was not closed in background
Bug: 291023102
Test: 1. Launch FingerprintEnrollFindSensor and back to introducntion
      2. Go to home screen
      3. Launch FingerprintEnrollFindSensor from recent app
      4. Check if FingerprintEnrollFindSensor is stopped
      5. make RunSettingsRoboTests -j96 ROBOTEST_FILTER=com.android.settings.biometrics.fingerprint
Change-Id: I65504f663340a0e66d1f8bcd2e7d4b3659282884
2023-07-14 07:49:41 +00:00
Bill Lin
88bc013487 Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76 am: f0278e6835
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896224

Change-Id: I470152428e4fe0ecf1fc9e8f3d499fca89d114db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 02:06:19 +00:00
Bill Lin
8ea74c3d76 Merge "Update screen lock and biometrics options in order" into udc-qpr-dev 2023-07-13 23:18:19 +00:00
Joshua McCloskey
5a4211ec82 Implement basic Fingerprint functionality.
Test: Verified enroll/deletion/renaming/authentication flows.
Test: atest FingerprintSettingsViewModelTest
Test: atest FingerprintManagerInteractorTest
Bug: 280862076
Change-Id: Ic34fd89f01f24468d0f769ef0492e742d9330112
2023-07-11 20:46:43 +00:00
Joshua McCloskey
b7f0d7a8ff Moving FingerprintSettings to Kotlin
This change is the first of many, it will

1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged

This change in particular is focused on transitions to and from various activities.

Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true

Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
Merged-In: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
2023-07-11 17:43:07 +00:00
lbill
7f8197da82 Update screen lock and biometrics options in order
Previously the screen lock and biometrics order is :
UI & UX: b/182806496, b/183649070
- PIN • Face • Fingerprint
- Pattern • Face • Fingerprint
- Password • Face • Fingerprint

By requirement, we need to reverse Fingerprint & Face position
- PIN • Fingerprint • Face
- Pattern • Fingerprint • Face
- Password • Fingerprint • Face

Also remove unused strings

Fixes: 242143765
Test: Manual login corp, and observe the UI in Choose screen lock
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I1938f867360512121ecfdae8e2ca6de7002156f4
2023-07-11 12:30:22 +00:00
Hao Dong
069c7ec1a9 Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev am: bee02bbbe7 am: d4f621f613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23881042

Change-Id: I62010625ecb3be7b3d6d76c79b0f051cc91a2357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 20:18:47 +00:00
Hao Dong
bee02bbbe7 Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev 2023-07-06 18:45:27 +00:00
Hao Dong
fefda226f7 Add super call in FingerprintEnrollEnrolling onConfigurationChanged.
Test: N/A - fix a crash
Bug: 289458339

Change-Id: Id34b1036fe12079b14cd3aaa0a85eecc138e6b17
2023-06-30 21:29:07 +00:00
Joshua McCloskey
9642d1e8cb Moving FingerprintSettings to Kotlin
This change is the first of many, it will

1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged

This change in particular is focused on transitions to and from various activities.

Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true

Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
2023-06-28 18:09:35 +00:00
Hao Dong
2ca3f3232c Fix Fingerprint enrollment UI when display size is largest.
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java

Test: manual test - 1. Set system display and font size largest
	            2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
Merged-In: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-06-27 17:48:16 +00:00
Hao Dong
be823bc598 Wait for systemui udfps overlay ready to show settings udfps enroll view.
Previously, we show settings's udfps enroll animation view (the fingerprint icon and progress view) once the FingerprintEnrollEnrolling is shown.
However, touch events have to wait for systemui's udfps overlay to be valid. This CL lets settings's udfps enroll view wait for systemui's overlay.
1. Sets udfps enroll animation view's default visibility Gone.
2. Propagates FingerprintManager#onUdfpsOverlayShown to
   FingerprintEnrollEnrolling and when it's called, set the enroll view
   visible.

Besides, this CL renames onPointerDown() and onPointerUp() with Udfps.

Bug: 280718879
Test: atest FingerprintEnrollEnrollingTest
Change-Id: Ieed3e74c182828918785edcacb021f19a3665f2a
2023-06-26 20:21:05 +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
70c833b8a2 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: d44eccbc5f am: 3f4a489b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Icf8b4f61424f79b4599c530d1aefe88d6cd6a795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 02:45:31 +00:00
Hao Dong
800728a5a6 Merge "Fix require on screen toggle on guest user." into udc-qpr-dev 2023-06-23 02:36:48 +00:00
Hao Dong
3f4a489b02 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: d44eccbc5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Id3aaa0b9e529de1dfde98decec6095f79e4b71f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 01:36:00 +00:00
Hao Dong
02f72c16ae Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: I97978a19733bc19904bd7fb72d80955e1f400d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 00:52:35 +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
Hao Dong
bf84218753 Fix delete face button disappear after reenroll
Test: manual test - 1.enroll a face 2. delete the face and reenroll 3.
back to face settings page, the button is delete button instead of set
up button
Bug: 285806446

Change-Id: I6739296b0b099446489956f8f609c87600ffdaa3
2023-06-21 18:45:40 +00:00
Grace Cheng
71a57d8cec Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: Ibde63cfed809364db4fdebdc97b45b7dadce5912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:50:58 +00:00
Hao Dong
9e1435a0dc Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de am: a9f1ed3501
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181

Change-Id: I88d843e5c1164e054d4cb48e3f953618e63e2e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 01:46:36 +00:00
Hao Dong
a9f1ed3501 Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181

Change-Id: Ia545f7902df20a47c6dc154cfb3d781541bb25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 01:45:55 +00:00
Hao Dong
61659799de Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev 2023-06-15 01:22:22 +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
Wenhui Yang
d56f96aaba Merge "Fix face model delete message" into udc-d1-dev 2023-06-13 20:43:42 +00:00
Grace Cheng
2d5f43d7e3 Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c am: f0614ef722
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: Icb68998721d53d5adbbbfe361b22361037e101e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 20:31:17 +00:00
Wenhui Yang
08d11518a8 Fix face model delete message
Add new strings for face model deletion when fingerprint unlock is available.

Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
(cherry picked from commit 5e71aee4cd)
2023-06-13 18:37:26 +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
Wenhui Yang
52d5bdc0c1 Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb316 am: 9ed0cee15f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23574345

Change-Id: Ib9580f0420fc4bd0de6b06234294af5c2feb8e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 02:59:29 +00:00
Wenhui Yang
4e059e6f4b Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev am: 14b115177c am: afa7bcb2e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23591204

Change-Id: I953acbc10670453878669fc3912c98bba4850470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 02:57:50 +00:00
Wenhui Yang
bfa2feb316 Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev 2023-06-13 01:02:42 +00:00
Wenhui Yang
14b115177c Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev 2023-06-13 01:02:08 +00:00