Oli Lan
52f5f2ee31
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Ic7660e922a883a8147447dad898d407c4f3d387e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 20:54:43 +00:00
Oli Lan
cbf1699cd7
Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Id74cd5fe28cec05a3fd87fc5434d28fad639e1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 20:24:55 +00:00
Oli Lan
ff5b6611cf
Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: I8cc4562420648436abb478b686adb96c28d8163b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 19:39:55 +00:00
Oli Lan
05ea36ddc5
Prevent exfiltration of system files via avatar picker. am: f70e351d1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: If9321bf1035c0492396adf4ce3b6579dfe31c66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 19:01:32 +00:00
menghanli
70a63abfe4
Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme
...
Apply same the sub text style from seekbar preference
Bug: 219752953
Bug: 229722937
Bug: 245093240
Fix: 245093240
Test: Manual testing
Change-Id: If107452b942e23dee17c73873f4aedc3a25c7f5d
(cherry picked from commit a8b9c805a2
)
2022-09-07 15:48:23 +00:00
Milton Wu
9b998b7dac
Refine checkMaxEnrolled() for fingerprint
...
FingerprintEnrollIntroduction shall allow setting 2nd fingerprint if
this intent is coming from "Anything else" page in SUW.
Bug: 228418807
Test: Manually test fingerprint in SUW
Test: ROBOTEST FingerprintEnrollIntroduction and
SetupFingerprintEnrollIntroduction
Change-Id: I62edeb91f90b32f62b3ca2b2ea04ec427b31d483
2022-09-07 07:49:42 +00:00
lbill
82a42834b1
Fix regression of pressing power key cancel sfps enrollment
...
Previous ag/19699461 used to fix UdfpsControllerOverlay bug.
However, we didn't consider a feature click power button to
notify user with a Toast on sfps project.
Bug: 245383975
Bug: 228261883
Bug: 242478941
Bug: 227905887
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Test: manual verify sfps enrollment, press/long press power key would
not cancel enrollment.
Test: manual verify udfps enrollment, UdfpsControllerOverlay lose focus
cancel enrollment.
Change-Id: I44394bdb91660b27a704064a7f7cdc5d0ad95d30
2022-09-07 04:01:40 +00:00
Lucas Silva
8f3ab66298
Update dream complications toggle summary
...
Change-Id: I49f3ac13bec5689e2aa69bae48f9a406ee6e467a
Fixes: 243973622
Test: manually flashed device and verified string in dream settings
2022-09-06 19:16:26 +00:00
TreeHugger Robot
9f1dba6017
Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev
2022-09-06 18:29:43 +00:00
SongFerng Wang
17122f9617
Merge "Add owner for job handover" into tm-qpr-dev
2022-09-06 04:57:49 +00:00
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
YK Hung
0bad72889e
Merge changes from topic "app_battery_usage" into tm-qpr-dev
...
* changes:
Fix loading bug when switching filters.
Align strings and UX across the different pages.
Move restricted apps page to new battery optimization page.
Add Apps > Battery optimization page implementation.
2022-09-05 03:17:57 +00:00
TreeHugger Robot
3888c098fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-04 23:48:18 +00:00
TreeHugger Robot
62d1153dfd
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-04 23:48:18 +00:00
TreeHugger Robot
ef25d97c1a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42
-s ours am: 7cfbf2e0d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843173
Change-Id: Ieb34095c5638f02d0ed510201bd09114ef736b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:09:06 +00:00
Bill Yi
ffa1118b35
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5
-s ours am: 810c7b6e7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843173
Change-Id: I4e18685e3793c45f4dc7ab4210ee11d8d7b1e116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:08:52 +00:00
Bill Yi
742cf7d2dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c
-s ours am: 01a2a417e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843170
Change-Id: If330ebc6c1efc7ebd0ad39604e327147a6279cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:08:40 +00:00
TreeHugger Robot
7cfbf2e0d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843173
Change-Id: Id7b45a9b0171e9ec92cd776c3364c642f54f70d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:08:03 +00:00
TreeHugger Robot
bf04811a50
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbae89efd6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843176
Change-Id: I27e2916909e412900c6fd6e27e8f27635602c451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:07:59 +00:00
Bill Yi
810c7b6e7a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843173
Change-Id: I51da3ed71a0456683db4a027a05f85ae262c13a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:07:48 +00:00
Bill Yi
6127c1b003
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817a494d0e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843176
Change-Id: Ia9ae02517c641af755178f7b058f551f1a839dd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:07:44 +00:00
Bill Yi
01a2a417e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843170
Change-Id: I9a9aaf6ac00fa7c5ad8ce954519d9cfec5222e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:07:35 +00:00
Bill Yi
82a5f45adc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6bce5228
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843172
Change-Id: I4963d15a61b5c403771a1c2ed92d4606733312db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:07:30 +00:00
TreeHugger Robot
98f921cf42
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-04 20:35:48 +00:00
TreeHugger Robot
cbae89efd6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-09-04 20:32:46 +00:00
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
Bill Yi
817a494d0e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibbc683ac8ab3e7c2489079c22fceb8ef6dd7add7
2022-09-03 19:59:47 -07:00
Bill Yi
6feabc3dad
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ife12a14d256682be8ef013386f48640475820351
2022-09-03 19:55:38 -07:00
Bill Yi
c798596fd5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If62421d8025fe9fc59a8805da0a21d889e56323e
2022-09-03 19:51:44 -07:00
Bill Yi
ac6bce5228
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6127e150c61694b772d6c8a4b9fdb745ca2907bb
2022-09-03 19:47:59 -07:00
Bill Yi
50bf87b270
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic576bd07f7dce331e6dfbcf463f1976935f0de16
2022-09-03 19:46:21 -07:00
Bill Yi
de9688841c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ice6605bdce55661c00d1190f954dc90461b9874b
2022-09-03 19:44:44 -07: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
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
Joe Bolinger
f9e992f490
Merge "Add product variants for unicorn strings." into tm-qpr-dev
2022-09-01 19:14:35 +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
TreeHugger Robot
d2074b38f2
Merge "Update the battery usage footer text from new UX review." into tm-qpr-dev
2022-09-01 09:23:28 +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
TreeHugger Robot
be48ee08a8
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-01 05:29:06 +00:00
TreeHugger Robot
cf1580e298
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-01 05:29:06 +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
Zaiyue Xue
43974fb247
Update the battery usage footer text from new UX review.
...
Fix: 242817645
Bug: 242817645
Test: manual
Change-Id: Ia353700f6d9c0f25d2af72110afcd539ae9068b0
2022-09-01 11:11:08 +08: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