Tiffany Nguyen
260c82477c
Fix loading bug when switching filters.
...
Also auto fix some lint issues.
Bug: 243337537
Test: Manual
Change-Id: I55a393517ae01d6a8c17106a3e7750323838cebb
(cherry picked from commit 67599bce4e )
Merged-In: I55a393517ae01d6a8c17106a3e7750323838cebb
2022-09-04 15:49:03 +00:00
Tiffany Nguyen
c2ad30d432
Align strings and UX across the different pages.
...
https://screenshot.googleplex.com/ercwXXcfg2QHkAW.png
https://screenshot.googleplex.com/AWfsrNWsJUbdF8x.png
Bug: 240711618
Test: Manual
Change-Id: I3d1083a7b50adffb67592b2e42914adf755bd6cd
(cherry picked from commit 1d1b115785 )
Merged-In: I3d1083a7b50adffb67592b2e42914adf755bd6cd
2022-09-04 15:48:55 +00:00
Tiffany Nguyen
032649b4f8
Move restricted apps page to new battery optimization page.
...
New entry: https://screenshot.googleplex.com/BbU6RnQhBbpnBc3.png
Restricted: https://screenshot.googleplex.com/5ggid7TcSsH9CUF.png
Old entry: https://screenshot.googleplex.com/7JgZpSfKs5zZb3Z.png
Bug: 240711616
Test: manual
Change-Id: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
(cherry picked from commit 3acd34fe4a )
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
2022-09-04 15:48:46 +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
TreeHugger Robot
8f0b3c2d6a
Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev am: 048bc692a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19774526
Change-Id: I0d86d362802950e46346718a02dc150fbfb59eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 21:05:43 +00:00
TreeHugger Robot
048bc692a4
Merge "Updated fingerprint dialog deletion strings." into tm-qpr-dev
2022-09-02 20:09:01 +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
SongFerngWang
76870250e8
Add owner for job handover
...
CP from the AOSP aosp/2200280.
Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
Merged-In: I9259596811cba08a21b78eebbe2f847e1aa6818c
2022-09-02 07:01:25 +00:00
Treehugger Robot
b151b094cc
Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a am: 02a5b5e487 am: f8701c71e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576
Change-Id: I23cc61383530de734ef9f3e8141078757a45ec22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 05:46:17 +00:00
Treehugger Robot
f8701c71e6
Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a am: 02a5b5e487
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576
Change-Id: Ie5e1fdec16f3c5dfcee1b7a8dccc400a4f6a781c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 05:01:47 +00:00
Treehugger Robot
02a5b5e487
Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6 am: 3799ecc58a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576
Change-Id: I59984a70a4a691ba4967238ec2eb5b2dbaf0ff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:34:07 +00:00
Treehugger Robot
36a80cd8e6
Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk"
2022-09-02 03:36:40 +00:00
Tetiana Meronyk
8b7a6d5349
Merge "Update icons in multiuser settings" into tm-qpr-dev am: a666d80973
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745315
Change-Id: Id3e70245326590a9c7948fbbbd9da2bfab866d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 20:08:17 +00:00
Joshua McCloskey
c76f988475
Updated fingerprint dialog deletion strings.
...
Test: Manual
Fixes: 234183857
Change-Id: Ieb500d52f705eb269937cd0fcd6b14081f9662ee
2022-09-01 17:27:51 +00:00
Tetiana Meronyk
a666d80973
Merge "Update icons in multiuser settings" into tm-qpr-dev
2022-09-01 16:55:29 +00:00
SongFerng Wang
954b9bafd0
Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f am: ea2cff12f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280
Change-Id: I83c762cdff99730bfcda9775beb69c41c70f45bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 13:32:14 +00:00
SongFerng Wang
ea2cff12f8
Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280
Change-Id: Ibe979b946fcc259208c710311e2ae7b7bce2a2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 13:06:57 +00:00
SongFerng Wang
545db0361f
Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280
Change-Id: Ibeb10dbb48e3b2332f9056674a0a237ff28d5f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 12:37:38 +00:00
SongFerngWang
2d59130485
Add owner for job handover
...
Will CP it into AOSP later.
Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
2022-09-01 16:09:35 +08: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
Jason Chiu
f9baa40744
Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev am: da28893958
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781356
Change-Id: I583f5c78e43b2b76405e2e7dc1f1794bf1c69cac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-31 02:59:48 +00:00
Jason Chiu
da28893958
Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev
2022-08-31 02:19:07 +00: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
Austin Delgado
71b2bb8f5c
Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev am: bbcdc91967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19582557
Change-Id: I7270f6c80cef2c28697e1ba85c9fcaaf57f25263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 17:37:21 +00:00
Austin Delgado
bbcdc91967
Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev
2022-08-30 17:15:49 +00:00
Tetiana Meronyk
86aee84483
Update icons in multiuser settings
...
Bug: 243631790
Test: manual visual
Change-Id: I2885d12ef3762e233a852978a0435a60e034f2c2
2022-08-30 16:14:32 +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
Jason Chiu
0e2147c5e2
Fix the injection disappearance in the Account detail page
...
displayTile() requires some parameters to determine whether to show the
injection tiles and update the intent, but the parameters were not
initialized.
Move the parameter initialization before super.onCreate() since
displayTile() will be called in super.onCreate().
Test: visual, robotest
Fix: 242673595
Change-Id: Idf2d758a8b8c4230e644bcd0d286a278d258b736
2022-08-30 06:46:39 +00:00
TreeHugger Robot
a8fe097b6a
Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev am: baa3f3a3c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19753508
Change-Id: I19b929cca3d6c9f0b48fa8a29c2245ff92c88ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 06:38:39 +00:00
TreeHugger Robot
8c232535cf
Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev am: 226107f1d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19755527
Change-Id: Ic0537775efd1294e9896adf5de3e61b84900fa09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 06:38:20 +00:00
TreeHugger Robot
baa3f3a3c6
Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev
2022-08-30 06:22:53 +00:00
TreeHugger Robot
226107f1d6
Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev
2022-08-30 06:22:14 +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
TreeHugger Robot
c8f45f75eb
Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev
...
* changes:
Bypass cancel error code during "Add another"
Fix udfps fingerprint setting flow
Use setting as base activity for fingerprint
Use Mockito 4.6.1 FingerprintEnrollFindSensorTest
2022-08-30 00:22:53 +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