Commit Graph

16846 Commits

Author SHA1 Message Date
TreeHugger Robot
06cc4ed4ab Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" into tm-qpr-dev 2022-09-05 07:51:36 +00:00
Tiffany Nguyen
3fa60efb6c Add Apps > Battery optimization page implementation. am: 6147e0fa5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19726219

Change-Id: I3498f3c1482acf6ece57bd1297bffd9c08d81c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:04:13 +00:00
Tiffany Nguyen
6147e0fa5c Add Apps > Battery optimization page implementation.
Moving the old restricted page to the new optimization page will happen
in a follow-up CL.

Test: Unit, manual
Bug: 238026672
Change-Id: I5fee9ebe03284a013da6bfca9ada8b166c6af91c
(cherry picked from commit 5ecb1a1d69)
Merged-In: I5fee9ebe03284a013da6bfca9ada8b166c6af91c
2022-09-04 15:44:18 +00:00
Weng Su
f49c24cb82 Hide toggle to Turn on Wi-Fi automatically preference in Search settings
- If the location setting is enabled, keep the current design. that the user can switch the toggle directly in the search settings to the "Turn on Wi-Fi automatically" toggle preference.

- If the location setting is disabled, hide the switch toggle to "Turn on Wi-Fi automatically" preference to avoid unexpected behavior.

- The user can click the "Turn on Wi-Fi automatically" preference to jump to the Network preference settings, and see a reminder message in the summary to enable the location settings first before switching the toggle.

- Move the check for mFragment to a suitable location to avoid unnecessary checks.

Bug: 235421460
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest

Change-Id: Ib2c6b90308606d32179334d13be91e308971084f
Merged-In: Ib2c6b90308606d32179334d13be91e308971084f
(cherry picked from commit 59403ef3f2)
2022-09-02 18:36:00 +00:00
YK Hung
06e92f5e45 Merge "Update defend tips card" into tm-qpr-dev am: 8bf872331b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101

Change-Id: I6c4d4d551dc4ccd1897422cd65bf26cadeb9994c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 15:46:17 +00:00
YK Hung
8bf872331b Merge "Update defend tips card" into tm-qpr-dev 2022-09-02 15:18:50 +00:00
TreeHugger Robot
23c78beab2 Merge "Update the timestamp label into uppercase and increase vertical offset" into tm-qpr-dev am: 0f1f02693e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19784482

Change-Id: Ic5be9dd619cb394992f829dc5d2f43c6cf2bd246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 06:42:11 +00:00
TreeHugger Robot
0f1f02693e Merge "Update the timestamp label into uppercase and increase vertical offset" into tm-qpr-dev 2022-09-01 06:35:09 +00:00
Wesley
243b450428 Update defend tips card
- Update defend tips card to unclickable
 - Update secondary button's action and content description
 screenshot: https://screenshot.googleplex.com/BYU8Mh5abJ9Tirh.png

Bug: 243769797
Bug: 243641857
Bug: 244219076
Test: make SettingsRoboTests
Change-Id: I7fdf5f7404d33f0374a992c83a7653a01b9f11bc
2022-09-01 04:09:31 +00:00
Grace Cheng
35125a3d2b Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev am: 2c9dab6f0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562137

Change-Id: I11ce675560e40ab1c946b01e14fee329e77bfac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 01:13:36 +00:00
Grace Cheng
2c9dab6f0a Merge "Implement SFPS guided enrollment for T6" into tm-qpr-dev 2022-09-01 00:47:41 +00:00
Grace Cheng
4a187e15d6 Implement SFPS guided enrollment for T6
Reduces perception of long enrollment process by introducing new enrollment layout and stages for SFPS. Also adds user feedback via new animated assets with dynamic colors, and all associated strings and a11y labels.

Test: Observe new guided enrollment process on T6
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 232024488
Fixes: 233091341
Fixes: 241165082
Fixes: 242218240
Fixes: 243813773
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
Merged-In: I1fa0b9349545586919eceeb9d05f365c2f2ec491
2022-09-01 00:47:22 +00:00
Diya Bera
c18579f168 Merge "SecuritySettings test" into tm-qpr-dev am: 73e4742941
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19672131

Change-Id: I9bd7d32f1ada80c9bf6456905a8be6fbe1b1d4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 18:56:36 +00:00
Diya Bera
73e4742941 Merge "SecuritySettings test" into tm-qpr-dev 2022-08-31 18:25:45 +00:00
ykhung
352e3a091d Update the timestamp label into uppercase and increase vertical offset
Update the timestamp label into uppercase based on the different locale
and increase the vertical offset from UX review feedback

Test: presubmit
Change-Id: Ie5e86967e36773f1f8c4f628501514b1a7fd22f5
2022-08-31 11:03:26 +08:00
Derek Jedral
6fec2be00d Fix Incorrect Trust Agent Count
The total number of trustagents can still be incorrect if the user
enables a trustagent, and then the trust agent component gets disabled,
since the user does not manually toggle the preference themselves. Fixed
by switching back to the original method of using TrustAgentManager, but
also pass a flag that allows us to choose on whether we want to filter
the trustagents based on whether it has an activity (which not all
trustagents are guaranteed to have).

Bug: 240969157
Test: Local test + atest
Change-Id: I5106859f61ddf36c1bf008da18be889ceaf27a8d
2022-08-30 17:43:11 +00:00
Bill Lin
2db995725b Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev am: 7d15cb501f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699461

Change-Id: If2c57ce270318368690eba8ed6680ab20f3dd260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 12:24:51 +00:00
Bill Lin
7d15cb501f Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev 2022-08-30 12:06:47 +00:00
Jenhou (Alan) Huang
6983f5867c Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev am: 95912773f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459988

Change-Id: I1891fca86dcff9c0251ba56f81f183ac76120162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 05:43:38 +00:00
Jenhou (Alan) Huang
95912773f9 Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev 2022-08-30 05:11:39 +00:00
TreeHugger Robot
a585bebcc8 Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev am: c8f45f75eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764093

Change-Id: I3b0053910613af42ecc91b8a416b131c662c1837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:37 +00:00
Milton Wu
7856ab058d Fix udfps fingerprint setting flow am: d3a1f700ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732077

Change-Id: Ib1e8d3aa448dca12b656bb4e0fcb3a3e85c394ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:35 +00:00
Milton Wu
84c9a6308f Use setting as base activity for fingerprint am: 561a68db20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732076

Change-Id: I84e533045cb9043e71634400081d02d2f04faf44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 00:53:34 +00:00
Alan Huang
a0da5b36bc [VolumePanel] Redirect volume panel action to SystemUI
The volume panel is moved to SystemUIDialog, so we
redirect the volume
panel creation to SystemUI.

Bug: 202262476
Test: manual build and use adb to launch with the volume panel action
intent. $adb shell am start -a android.settings.panel.action.VOLUME

Change-Id: I9f23eb68fb7c83d6f0f023f5eefc4290a35db3c3
2022-08-29 18:50:30 +00:00
Milton Wu
af5a7d8dc0 Bypass cancel error code during "Add another"
1. When user chooses "Add another" on latest fingerprint enroll page, we
   shall bypass RESULT_CANCELED from FingerprintEnrollEnrolling. This is
   because user has successfully enrolled a fingerprint before enter
   FingerprintEnrollFinish page.

2. In FingerprintEnrollFindSensor
   A. Do not call startLookingForFingerprint() if mNextClick is true
      because it is wating the result back from
      FingerprintEnrollEnrolling, and let onActivityResult() mehtod to
      handle correct behavior.
   B. Add tests for following cases
      a. Sidecar existence
      b. Activity recycled and recreate in order to get activity result.

Bug: 243701933
Bug: 243762418

Test: ROBOTEST for SetupFingerprintEnrollFindSensorTest,
   FingerprintEnrollFindSensorTest, SetupFingerprintEnrollFinishTest

Test: Test scenarios w/ and w/o always_finish_activities
  1. Enroll a fingerprint but cancel it during enrolling in SuW
  2. Enroll a fingerprint in SuW
  3. Add another fingerprint in SuW
  4. Run "Add another" but cancel it during enrolling in SuW
  5. W/o enrolled fingerprint, add first fingerprint in settings
  6. W/o enrolled fingerprint, add first fingerprint but cancel it
     during enrolling in settings
  7. W/o enrolled fingerprint, add first fingerprint and choose "Add
     another" in settings
  8. W/o enrolled fingerprint, add first fingerprint and choose "Add
     another" then cancel it during enrolling in settings
  9. W/ 1 enrolled fingerprint, add fingerprint in settings
  10. W/ 1 enrolled fingerprint, add fingerprint but cancel it during
      enrolling in settings
  11. W/ 1 enrolled fingerprint, add fingerprint and choose "Add
      another" in settings
  12. W/ 1 enrolled fingerprint, add fingerprint and choose "Add
      another" then canel it during enrolling in settings

Change-Id: I03d8d8ebc39eb34f8fc28acb5cd267e37c7a0311
2022-08-29 07:22:45 +00:00
Milton Wu
d3a1f700ee Fix udfps fingerprint setting flow
1. on udfps + faceunlock devices, fingerprint settings shall not be
   launched if no fingerprint enrolled.
2. on udfps device, after first fingerprint enrollment successfully,
   fingerprint settings shall be shown.
3. Update FingerprintEnrollFindSensorTest to support udfps cases.

Bug: 243701933
Bug: 243003012
Test: manully adding first fingerprint on udfps + faceunlock device
Test: manully suw on udfps + faceunlock device
Test: run robotest for FingerprintEnrollFindSensorTest
      and SetupFingerprintEnrollFindSensorTest

Merged-In: I62d945f2c2e980edf2a885234e54acae109e7672
Change-Id: I62d945f2c2e980edf2a885234e54acae109e7672
(cherry picked from commit 936dd31312)
2022-08-29 07:22:40 +00:00
Milton Wu
561a68db20 Use setting as base activity for fingerprint
Change to use FingerprintSetting as base activity when use launch
"Fingerprint Unlock" from Settings -> Security. And then we can prevent
that necesssary pop-up activites become full-screen.

Bug: 243701933
Bug: 232874879

Test: manual test following cases on fp-only devices, and enable don't
      keep activity and test them again.
      1. fp enrollment on SUW
      2. fp add another on SUW
      3. add first fp on Security Settings
      4. add another fp on Security Settings
Test: atest FingerprintStatusUtilsTest BiometricsSafetySourceTest
Test: robo test for SetupFingerprintEnrollFindSensorTest
      SetupFingerprintEnrollFinishTest
      FingerprintEnrollFindSensorTest FingerprintEnrollEnrollingTest

Merged-In: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
Change-Id: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
(cherry picked from commit 84b39c3ed0)
2022-08-29 07:21:42 +00:00
Milton Wu
e167286a37 Use Mockito 4.6.1 FingerprintEnrollFindSensorTest
Due to java import has been changed in downstream, update import part to
use Mockito 4.6.1 inside FingerprintEnrollFindSensorTest to prevent
downstream merge conflict.

Bug: 243701933
Test: roboTests FingerprintEnrollFindSensorTest
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
Change-Id: Idbf7852d95b248293909f73a0cce69de166931c9
2022-08-29 06:44:32 +00:00
Bonian Chen
6af2fb8578 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: If948deb5fc93c3654e474bd4d4d588859affbfa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 04:12:07 +00:00
Bonian Chen
90a36213bb Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248

Change-Id: Id550ed73ab4e6dd7c01504eaf315de23598aff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 11:17:02 +00:00
Bonian Chen
d2644b4ea9 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev 2022-08-26 10:52:02 +00:00
Bonian Chen
8c6c1ca236 [Settings] Not allow APN delete when adding is not an option
When not allowing APN to add, user may not be able to recover easily
when delete it.

Therefore, avoid from APN to be deleted when adding is not allowed.

Bug: 243664439
Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:52:42 +00:00
Bonian Chen
9202260a42 [Settings] Not allow APN delete when adding is not an option
When not allowing APN to add, user may not be able to recover easily
when delete it.

Therefore, avoid from APN to be deleted when adding is not allowed.

Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:50:51 +00:00
lbill
e944661955 Cancel UDFPS enrollment on overlay focus loss
Integrate onWindowFocusChanged() to FingerprintEnrollEnrolling
When the activity window lost focus, we just cancel this enroll
session, and create a dialog to notify user.

* Keep legacy rotation behavior, do not cancel enrollment if user
  rotate device.
* This change will cancel enrollment when user interrupted by
  1) Swipe down Notification Shade
  2) Heads up notification expand
  3) Bubble Expanded
  4) Google Assist
  5) PIP expand
  6) Recents
  7) Launch Power Menu(Global Action)

Test: manual test above scenario
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 228261883
Bug: 242478941
Bug: 227905887
Change-Id: Id097e6b15928646cd5ab91c2a1f6eb1bb9bf190b
2022-08-26 01:30:33 +00:00
Tom Hsu
a18ec335a9 Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev am: 34cb6d3237
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674012

Change-Id: I30906dc1a60949776b27ba6df3fe723f1eed6076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 07:25:44 +00:00
Tom Hsu
7dfd2ade2f Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790

Change-Id: I767bf8a2b177a5b764458e7c8fff90e3de1b869b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 07:25:42 +00:00
Tom Hsu
34cb6d3237 Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev 2022-08-25 06:24:12 +00:00
Tom Hsu
bd3c0da9e3 Merge "[Languages] Add new information to system language page." into tm-qpr-dev 2022-08-25 06:24:12 +00:00
Bill Lin
ac4f84f05d Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e391
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732587

Change-Id: I404da502a6cfa3d8e40ca7ee935332e9e4931968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 05:41:19 +00:00
Bill Lin
fd8e54e391 Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev 2022-08-25 04:36:14 +00:00
Chloris Kuo
fd947cb0b3 Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev am: 6f79ffd831
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19717110

Change-Id: If0ff5b45d3e38a1e5b08cb6a648ea64474b731d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 22:59:00 +00:00
Chloris Kuo
6f79ffd831 Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev 2022-08-24 22:37:58 +00:00
Diya Bera
58facec91e SecuritySettings test
Test: atest
Fixes: 234309000
Change-Id: I3c5772bd33fe7280d35ca0d78a647a5dd7e0a00c
2022-08-24 21:08:04 +00:00
Chloris Kuo
54c677a83c Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications
Show detail settings page from the default NAS app if it implements the new intent ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS.

Test: Robotest, manually test on device
Bug: 231492005
Change-Id: I6566cd9d615331a56728613583295637982bcd3f
Merged-In: I6566cd9d615331a56728613583295637982bcd3f
2022-08-24 19:51:08 +00:00
Michael Wright
bbde399410 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797

Change-Id: Ifa352490aff4a215710aec57e6d42aab162d5cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 16:05:15 +00:00
Michael Wright
1218065085 Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev 2022-08-24 15:24:15 +00:00
lbill
7a4ddb8337 Set appropriate theme for SkipFingerprintDialog
The SkipFingerprintDialog is instantiation in
SetupFingerprintEnrollFindSensor#onSkipButtonClick()

Due to the call flow did not set appropriate theme
defined in setuplib for skip alertDialog instance
we set GlifV2ThemeAlertDialog AlertDialog.Builder.

Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      SetupFingerprintEnrollFindSensorTest
Test: manual factory reset, go through SUW, and check
      skip AlertDialog Bottom Bar Buttons visual.
Bug: 233243999
Change-Id: Ic198a23eb3e76d70e287b24f2ab1ef249b30b2fc
2022-08-24 13:45:21 +00:00
Michael Wright
475632c4fe Revert^3 "Improve App notification loading"
33710fd9e2

Change-Id: Ifb45f949c28bff04f8abfe3e1a73628f2e407241
2022-08-24 12:22:12 +00:00
Bonian Chen
80e17e97f3 Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev am: 6920c9e7ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673417

Change-Id: I0ce4c4789f2e839ab92b71a8b517cc2680e49c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 07:03:40 +00:00
Bonian Chen
6920c9e7ce Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev 2022-08-24 06:38:58 +00:00