Commit Graph

839 Commits

Author SHA1 Message Date
Milton Wu
cdaf1091d1 Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007 am: 544feb9013
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281

Change-Id: I748aafeb257bfc6325f5e3a0ef724dbd0e36d697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 01:33:58 +00:00
Milton Wu
544feb9013 Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281

Change-Id: I1a80e569626469eaca583007ee94fb77bf36f03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 00:57:38 +00:00
lbill
c7dd729a43 Launch Face Settings when device enrolled face
In legacy flow FaceEnrollIntroduction check maxFacesEnrolled()
then update introduction description and prevent user go to next
enroll step, the CUJ was not good to user, instead bring user
to Face Settings and let user decide the next action(Delete face or
change config) is more make sense.

As any applications could broadcast intent(android.settings.FACE_ENROLL)
to bring FaceEnrollIntroduction up, we add a check in onCreate() and check
if device has been enrolled max face, launch FaceSettingsInternalActivity.

In addition, skip to register any posture change callback when
maxFacesEnrolled() during activity onStart().

Test: atest SettingsGoogleUnitTests
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
      "FaceEnrollIntroductionTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
      "FingerprintEnrollIntroductionTest"
Test: Manual enrolled face, unfold device, launch Tips Security page
and click "Set up Face Unlock", device launch Face Settings insteand of
posture guidance page.

Bug: 263830403
Change-Id: Ied8b92259810f954ce6b2daaa9b87fc996ad752a
2023-03-21 19:10:57 +00:00
Jason Chang
9522a44bb6 Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev 2023-03-18 14:10:58 +00:00
Jason Chang
848973d300 Fix the Fingerprint enrollment page's title text creates a truncate
problem when it needs three lines on the R4 device

Add padding between title and lottie animation, and adjust UDFPS
enroll view top margin.

Bug: 269437675

Test: manually test,
1.Go to Go to Settings > Security > Fingerprint Unlock >
Set up Fingerprint Unlock > How to set up your fingerprint >
Touch & hold the fingerprint sensor ,
then to start enroll fingerprint.

2. Always keep the finger in the same position,
then let the title become a three line description
“Change the position of your fingerprint slightly each time”.

3. Check the UI if it has been fixed.

Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.biometrics.fingerprint.FingerprintEnrollEnrollingTest"

Change-Id: Ib330e9fbe01b959892f2f9007ce35f5ab107e42e
2023-03-18 03:40:45 +00:00
Diya Bera
3a4c6feb0a Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: I27b79bf6dcc69e42ea3af7f5b1274173676996fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-11 01:14:57 +00:00
Diya Bera
9a93c8a00f Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: Iddfaa9baa18e16d3b1f5e06de88d74faf208c811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 23:26:58 +00:00
Diya Bera
8ceded494f Remove subtext when enrollment stage changes
Bug: 272145668
Test: Manual (Try enrolling fingerprint in UDFPS, the subtext should
disappear when lottie asset is introduced)

Change-Id: I912ff2b32644d05cc189105ae1679fa14b04a1ef
2023-03-08 23:00:47 +00:00
Diya Bera
f3012c6497 Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025

Change-Id: Ic8b8eea0c25961ccc05b3d344161e1a194104b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:26:01 +00:00
Diya Bera
afa29d5cb8 Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842

Change-Id: Ia2a62797dd783366a5d2df4494a25d748fac7995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:24:11 +00:00
Diya Bera
47cedbde0a Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev 2023-03-02 22:21:12 +00:00
Diya Bera
961b32ca28 Learn more updated in Fingerprint Settings for side fps
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
Merged-in: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
2023-03-02 19:09:34 +00:00
Diya Bera
4c3ac9b994 Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev 2023-03-02 19:09:23 +00:00
Diya Bera
327eaf16fb Removed subtext from side fps enrollment flow
Test: Manual (Try to enroll your fingerprint in a side fps device, and
observe that there is no subtext in landscape mode)
Bug: 267271891

Change-Id: Iba4c13e8083ecb92f8033882af9147f14071e726
Merged-in: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-02 18:42:02 +00:00
Diya Bera
36e41dc985 Merge "Removed subtext from side fps enrollment flow" into udc-dev 2023-03-02 17:16:31 +00:00
Jason Chang
a441922bdd Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev 2023-03-02 16:24:16 +00:00
Jason Chang
c3fae47144 (2/2) Fix No clear steps for "re-enroll face unlock
When the user has face id registered but failed enrolling in
device lock state, lead users directly to the confirm deletion
dialog in Face Unlock settings.
- When receiving a face id re-enroll extra intent data, lead users
directly to the confirm deletion dialog in Face Unlock settings.

Bug: 233069240

Test: manually force enrolling face id fail, then doing test steps:
1. Receive notification that face unlock needs to be re-enrolled
2. Tap it then entering device
3. Check if showing the confirm deletion dialog in Face Unlock
settings.

Change-Id: I4eb09cf4a7d92a1dd9866c5c8b938aeb8c7eddf5
2023-03-02 06:53:31 +00:00
Diya Bera
7fa342fadb Removed subtext from side fps enrollment flow
Test: Manual (Try to enroll your fingerprint in a side fps device, and
observe that there is no subtext in landscape mode)
Bug: 267271891

Change-Id: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-01 23:17:27 +00:00
Hao Dong
b48c247ef9 Merge "Do not announce a11y move instructions in sensor area." into udc-dev 2023-03-01 22:53:23 +00:00
Diya Bera
5faf4eeb8e Learn more updated in Fingerprint Settings for side fps
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
2023-03-01 01:13:03 +00:00
Hao Dong
4a2d7d29d7 Do not announce a11y move instructions in sensor area.
Test: manually test by enabling talkback
Bug: 270437012
Change-Id: I9433772dea1bb667255c367c0ee8c9bab4201d57
2023-02-27 23:51:32 +00:00
Milton Wu
94b421b253 Refine FingerprintEnrollmentActivity
1. Fix backstacks after enrolling finish
2. Support skipFindSensor and skipIntro

Bug: 260957939
Test: Manually test it on different sensor devices
Change-Id: I4061e29999a47bf4859d6562ad82330fb0f6f620
2023-02-25 08:08:31 +00:00
Diya Bera
1da59b0eab Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: I8efe213dc674f2790130d2935ce9062546b5210f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 18:42:46 +00:00
Diya Bera
65721576d8 Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: If6a80674fa3d00f6d5a82110df1f2bab50693ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 18:15:52 +00:00
Vincent Wang
4e8bded71b Fix FaceSettings UI problem
Update the visibility of button in onStart to avoid missing check
state if Fragment & Activity were restarted

Bug: 269553342
Test: 1. enroll face
      2. go to settings > Security  privacy > device lock > face & fingerprint unlock
      3. Eenter screen lock
      4. Click face unlock > delete face model
      5.re-enroll face
      6.check the UI of face unlock detailed page
Change-Id: I152467afe2cc90932a53fe73b541e97b5b742831
2023-02-21 07:37:17 +00:00
firewall
7ba30ffcf8 Refactor FingerprintEnrollEnrolling to fragment
Bug: b/260957933
Test: NA
Change-Id: I5b65f5957569418e85c39f05bc2fece856ef4a2b
2023-02-20 10:47:48 +00:00
Diya Bera
b7f615bd4d Remove duplicate code
Bug: N/A
Test: N/A
Change-Id: I74208245ec2d46b803e89a1b6a5a3806e7e69739
2023-02-17 23:57:38 +00:00
Joshua McCloskey
00a2136ffa Dismiss dialog on acquire message event.
Test: Verified that any acquired message dismisses the touch dialog
Fixes: 265502746
Change-Id: I4791edeb9bfdb308778136cd91205560db59f0a8
2023-02-15 18:48:14 +00:00
Milton Wu
211313b52d Attach FingerprintEnrollFinishFragment to activity
Start FingerprintEnrollFinishFragment when enrolling page is done.

Bug: 260960831
Test: atest FingerprintEnrollmentActivityTest
      FingerprintEnrollmentViewModelTest
Change-Id: Ia751c20330dfdcac91e961acc70aa033b05de03f
2023-02-14 19:18:56 +08:00
TreeHugger Robot
34b7835a50 Merge "Hide "no thanks" button when enrollment completed." 2023-02-11 02:34:19 +00:00
Hao Dong
54003698b1 Do not show udfps enrollment page in multi window mode.
In multi window mode, finish FingerprintEnrollEnrolling activity
and show a toast.

Test: atest FingerprintEnrollEnrollingTest
Bug: 184118847
Change-Id: I8cfa61b334c029185e1bbf46fdbf158bb493a1e0
2023-02-10 01:30:30 +00:00
TreeHugger Robot
d590c1ebc9 Merge "Add tests for SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS." 2023-02-08 01:55:28 +00:00
TreeHugger Robot
e57000f2c4 Merge "Add animation for progress bar and lottie in fingerprint enrollment" into tm-qpr-dev am: a48f8944f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21145688

Change-Id: I69ac66e0a3d92a21c18f8980607d8b9c6571101e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 00:37:40 +00:00
Diya Bera
7eb40da9c4 Add animation for progress bar and lottie in fingerprint enrollment
Test: Manual - While enrolling a fingerprint, onHelp will cause the
lottie and progress bar to shake
Bug: 266838595

Change-Id: I547d86182a87846aca7d025b35a008675f449e2e
Merged-in: I547d86182a87846aca7d025b35a008675f449e2e
2023-02-07 22:48:55 +00:00
Diya Bera
488f69a0af Merge "Add animation for progress bar and lottie in fingerprint enrollment" 2023-02-07 22:48:40 +00:00
Diya Bera
e211c103b8 Add animation for progress bar and lottie in fingerprint enrollment
Test: Manual - While enrolling a fingerprint, onHelp will cause the
lottie and progress bar to shake
Bug: 266838595

Change-Id: I547d86182a87846aca7d025b35a008675f449e2e
2023-02-07 17:48:42 +00:00
Hao Dong
2e72b749ee Add tests for SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS.
Bug: 260617060
Test: atest FingerprintEnrollEnrollingTest
Change-Id: I82fdadfd57c2f7f5adef423250ee6c880b4d6b1b
2023-02-07 21:05:40 +08:00
Milton Wu
81530e3f27 Attach FingerprintEnrollEnrollingRfps fragment
Support enrolling RFPS on biomerics v2.

Bug: 260957939
Test: atest FingerprintEnrollFindSensorViewModelTest
      FingerprintEnrollProgressViewModelTest
      FingerprintEnrollmentViewModelTest
      FingerprintEnrollmentActivityTest
Change-Id: Ic04b934592415d03f1b119383bffd40bd5eef2bd
2023-02-07 12:11:45 +00:00
Hao Dong
1d45f7f6ed Merge "Add udfps/ and support a11y for the udfps enroll view." 2023-02-03 00:30:03 +00:00
Prabal Singh
e312ffa512 Merge "Add support for Biometrics for work Source for SC" 2023-02-02 10:59:13 +00:00
Hao Dong
24f8463af4 Add udfps/ and support a11y for the udfps enroll view.
This CL calls methods in UdfpsEnrollUtils.java to announce a11y
message. Besides, scale factor calculation and UdfpsOverlayParams.java
are removed since they are added in settingslib/.

Test: manually tested on device:
      Turn on talkback and turn this flag on via adb command
      adb shell setprop
        sys.fflag.override.settings_show_udfps_enroll_in_settings true
Bug: 186873966, 260617060
Change-Id: I408ac6a36352aa4bfd4ac1374e3922163dbc2199
2023-02-02 11:25:14 +08:00
Diya Bera
55dd3a4f6d Merge "Tests for SUW in work mode" into tm-qpr-dev am: 31406c042d am: 4d67530e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505465

Change-Id: Ib6259a7897a43bc326410c17c4baa5f681edc7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 00:33:16 +00:00
Diya Bera
4d67530e85 Merge "Tests for SUW in work mode" into tm-qpr-dev am: 31406c042d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505465

Change-Id: Ida39801c898a529725f3fc7484e8907a2591e348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 23:59:37 +00:00
Diya Bera
1021b58ae5 Tests for SUW in work mode
Bug: 247049655
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MultiBiometricEnrollHelperTest
Change-Id: Ifabb96a90c340bc9306cc0f033ba103c614f32a9
2023-02-01 22:05:09 +00:00
Derek Jedral
999372caf4 Fix NPE with registering content listener
1) Fix the condition to check either subscribed or null.
2) Don't register listeners unless the feature flag is enabled

Test: make RunSettingsRoboTest
Bug: 267357231
Change-Id: I0134812cbac60c394d96c5a5621a7c16d781b05d
2023-01-31 15:16:45 -08:00
Derek Jedral
957a35bd26 Merge "Route to active unlock component" 2023-01-31 19:43:05 +00:00
Hao Dong
5e3fd696a5 Hide "no thanks" button when enrollment completed.
Test: atest FingerprintEnrollIntroductionTest
Bug: 262666155
Change-Id: I61549029f87e7bbee665f47d24f9a929ad8b4df1
2023-01-31 22:07:25 +08:00
Yuanjia Hsu
10ed79ba5c Merge "Implement “Set up Face or Fingerprint Unlock first” page" 2023-01-31 07:49:22 +00:00
Milton Wu
1cef4545c8 Update fingerprint introduction string
Update introduction string to show device name

Bug: 251727719
Test: Manually check FingerprintEnrollIntroduction and
      FingerprintSettings page
Change-Id: Ie44a5e3e41e0ff2acaaa2388b04068b218da1c67
2023-01-31 05:28:42 +00:00
Derek Jedral
001aae8dfe Merge changes from topic "au-initial-commit-master"
* changes:
  Update text when Active Unlock is enabled.
  Update tile summary from ContentProvider.
  Add Active Unlock tile under face & fingerprint
  Add ActiveUnlock check when picking preference
2023-01-31 03:24:22 +00:00