Commit Graph

817 Commits

Author SHA1 Message Date
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
Derek Jedral
053a9f8947 Route to active unlock component
Update onRetryPrefenceTreeClick to check for the active unlock
preference. If biometrics are not enrolled and we're using the
biometric failure model, launch the biometric setup flow. Otherwise,
launch the  component directly.

Test: manual flag flip, confirm activity launches
Bug: 266441818
Change-Id: I8f3ce8f8366b65aad622d33ff7f99f5c82aae3e8
2023-01-30 16:48:52 -08:00
yuanjiahsu
06466b030b Implement “Set up Face or Fingerprint Unlock first” page
The activity which instructs the user to set up face or fingerprint unlock before setting the watch unlock

Bug: 264813445
Bug: 264962961
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ActiveUnlockRequireBiometricSetupTest
Change-Id: I556c62b6b8102f6e15045a37cf506c0c0eedf733
2023-01-30 16:48:52 -08:00
Derek Jedral
9134f24f31 Update text when Active Unlock is enabled.
Update the security summary, intro, and unlock your phone summary when
Active Unlock is enabled and enrolled on the device.

Test: make RunSettingsRoboTests
Test: manually flip flags, confirm combined page has updated strings
Bug: 264812018
Change-Id: I2843e9f3aa0f38a9f2ebb18d60fed6293f9ce36e
2023-01-30 16:48:52 -08:00
Derek Jedral
334e48f4ff Update tile summary from ContentProvider.
A subscription is created and destroyed based on the lifecycle events.
Fetching the summary is done asynchronously to prevent blocking the UI
thread.

Test: make RunSettingsRoboTests
Test: manually flip flags, confirm tile has dynamic summary
Bug: 264812018
Change-Id: Ib1149ec6907b6a70226c36d37431023aaf6ad557
2023-01-30 16:48:44 -08:00
Derek Jedral
d3d08609d3 Add Active Unlock tile under face & fingerprint
This tile will eventually link to GmsCore. It only shows up for non-work
profile face & fingerprint pages. Its visibility depends on both whether
the corresponding GmsCore component is enabled, as well as the feature
flag.

Test: make RunSettingsRoboTests
Test: manually flip flags, confirm tile shows in combined biometric page
Bug: 264813301
Change-Id: Ieea53f00e46cfbfe87e3b31756f64f299b7d3174
2023-01-30 12:11:12 -08:00
Derek Jedral
d828e0abf5 Add ActiveUnlock check when picking preference
Modify BiometricsSettingBase to also track if the hardware is supported
and if the controller is a work profile controller. If the hardware is
supported and active unlock is enabled, non-work profile controllers
will still be displayed.

Test: make RunSettingsRoboTests
Test: manually flip flags on device with active unlock, confirm new
layout used
Bug: 264813302

Change-Id: Idb0e994453d4fd5c078c45f87d5d8cee339053a2
2023-01-30 12:11:07 -08:00
Prabal Singh
e7b9d04222 Add support for Biometrics for work Source for SC
Fixes: b/266818876
Fixes: b/238870897
Test: manually tested
Change-Id: I674b89226c445399dea69e4355b124f376e7f38d
2023-01-29 04:40:05 +00:00
Diya Bera
789071c86e Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev am: 9f1e35fe1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21089906

Change-Id: Ie0b1bdb3ab1fe0a28362d7529431f890905507f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 00:55:28 +00:00
Diya Bera
9f1e35fe1a Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev 2023-01-25 22:16:34 +00:00
Diya Bera
561e87932d Merge "Added string to encourage user to enroll more fingerprints" 2023-01-25 19:47:11 +00:00
Diya Bera
711f16ddd8 Added string to encourage user to enroll more fingerprints
Test: Manual - Finish enrolling a fingerprint and check the message
displayed
Bug: 265023475

Change-Id: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
Merged-in: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
2023-01-25 18:32:13 +00:00
Diya Bera
1c2423f36b Added string to encourage user to enroll more fingerprints
Test: Manual - Finish enrolling a fingerprint and check the message
displayed
Bug: 265023475

Change-Id: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
2023-01-25 18:04:38 +00:00
Treehugger Robot
5ebb151415 Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95 am: 1d7192e9f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034

Change-Id: I8a73e24c88fcbecc35ea77ef79a253790a77f949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 02:58:33 +00:00
Treehugger Robot
1d7192e9f6 Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034

Change-Id: I4f2e99ebcb887b0203fcb7bb915968b4acd11f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 02:15:02 +00:00
Ilya Matyukhin
67d47f6b4a Fix NullPointerException when renaming a fingerprint
(Original change made by xingbin.feng@sony.com)

Fix NullPointerException when rotating the screen while renaming
a registered fingerprint

Bug: 236873593
Test: Click a registered fingerprint to open the Rename dialog,
rotate the device and press OK. Verify that Settings does not
crash

Change-Id: I1350c4bd121e0a7aaa291b3b8f96c80ef777150b
2023-01-24 23:55:29 +00:00
Piotr Wilczyński
059ddcbcb4 Merge "Set display size to all displays" into tm-qpr-dev am: 0066afbe15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20664686

Change-Id: Ib3d9210dab71e6aa600bfa9f6f9ec5b68ab68dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 10:11:00 +00:00
Piotr Wilczyński
0066afbe15 Merge "Set display size to all displays" into tm-qpr-dev 2023-01-20 09:39:50 +00:00
Hao Dong
25bb53260b Merge "Fix UI bugs for udfps enroll in settings." 2023-01-19 21:24:07 +00:00
Grace Cheng
4849540cef Merge "Prevents retrying fingerprint after lockout reset if user exits FingerprintSettings" into tm-qpr-dev am: 5c10188254 am: 392d971067
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21038428

Change-Id: Ia6c0c8846e214aa40165f73a1634a1f0b1ed2dc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 04:32:02 +00:00
Grace Cheng
392d971067 Merge "Prevents retrying fingerprint after lockout reset if user exits FingerprintSettings" into tm-qpr-dev am: 5c10188254
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21038428

Change-Id: Ie39ae67775c24103c904efccdc80423d6a479f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 03:55:18 +00:00
Grace Cheng
5c10188254 Merge "Prevents retrying fingerprint after lockout reset if user exits FingerprintSettings" into tm-qpr-dev 2023-01-19 02:54:26 +00:00
Hao Dong
967203de77 Fix UI bugs for udfps enroll in settings.
This CL fixes four bugs for SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS feature:
1. When the udfps view is big enough (i.e. landscape mode on panther), the progress bar's bottom is clipped by the footer button.
- Sets the footer button width WRAP_CONTENT and removes the space view to make the footer button short enough, not hiding the udfps view progress bar.

2. When both text size and display icon size are big enough on the portrait mode, the udfps view's position is wrong because its parent views are longer than the screen and scrollable.
- Add addOnDrawListener() on udfps view's parent view, whenever it's changed, recalculate the margins of udfps view to make sure it's aligned  with the sensor's position.

3. When the finger is down on the screen and the lighting circle on the sensor is shown, the fingerprint icon is not hidden.
- Propagates FingerprintManager#onPointerDown and #onPointerUp to UdfpsEnrollView and hide/show fingerprint drawable accordingly.

4. When rotating the screen, fingerprint location is not right because UdfpsEnrollHelper is recreated.
- Makes UdfpsEnrollHelper a fragment and call setRetainInstance(true) to keep it even though the configuration is changed.

Test: manually tested on device:
      Turn this flag on via adb command
      adb shell setprop
        sys.fflag.override.settings_show_udfps_enroll_in_settings true
Bug: 260617060
Change-Id: I15ffde6455cab7e9d4a394349ec39e72df5b2911
2023-01-19 09:56:16 +08:00