Arc Wang
999bc0b0d0
[automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours am: eeafd49d4e -s ours am: ecf1846617 -s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: I510fb01461bb9f9c3e3512e8a2453c3e2ada6a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:27:37 +00:00
Tsung-Mao Fang
4423f3e0b6
[automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours am: b8fd889067 -s ours am: 38ee0a345a -s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: Id5bb6d930eb0c0c8fdeef3b9dfa9bb1a0399018f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:27:35 +00:00
Arc Wang
ecf1846617
[automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours am: eeafd49d4e -s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: Ic02f075561163bbe76ec94cea2640e1bbdee5915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:55:19 +00:00
Tsung-Mao Fang
38ee0a345a
[automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours am: b8fd889067 -s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: Id0a41a267ae5106ed4fc236500c92a949f1f7f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:55:18 +00:00
Arc Wang
eeafd49d4e
[automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e -s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: I07c9886a2bceaab3eccf3e1690ced01118240717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:41 +00:00
Tsung-Mao Fang
b8fd889067
[automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: I326f27db0a1247719b08e84597051477baad4266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:37 +00:00
Arc Wang
9a6c84c47e
Merge "FRP bypass defense in the settings app" into sc-v2-dev
2023-01-04 01:51:22 +00:00
Yasin Kilicdere
85379e9452
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 13:25:59 +00:00
Yasin Kilicdere
2ecf96a422
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 12:53:48 +00:00
Yasin Kilicdere
15a89a60ac
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev
2023-01-03 12:18:58 +00:00
TreeHugger Robot
20d80e79da
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-31 06:37:56 +00:00
TreeHugger Robot
3988c628f1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-31 06:37:56 +00:00
Bill Yi
5baeaab354
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If04ffff758b1c88b3b7576858f8760893ee04bcf
2022-12-29 20:55:43 -08:00
Bill Yi
c5c5fb43da
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaabefc3fcd1e7c28c769f416ad25a32c37beaac0
2022-12-29 20:54:14 -08:00
Bill Yi
aca33157e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia82d4eaed61ad8144ea278b4b64f6391cb044fb3
2022-12-29 20:51:10 -08:00
Ale Nijamkin
53b342a81a
Merge "Renames customization content provider (2/7)." into tm-qpr-dev
2022-12-28 17:42:20 +00:00
TreeHugger Robot
6c9dead089
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-28 05:53:23 +00:00
Alejandro Nijamkin
2f61fd67d1
Renames customization content provider (2/7).
...
KeyguardQuickAffordanceProvider has started to be used for more than
just lock screen shortcuts. This collection of CLs updates its name,
authority, and table schema to become more generically about "system UI
customization".
Fix: 262879277
Test: manually verified Settings > Display > Lock screen shows the
"shortcuts" item
Test: manually verified that the Wallpaper picker properly renders the
preview and can change the quick affordances
Test: manually verified that system UI displays the right lock screen
shortcuts
Change-Id: Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2
Merged-In: Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2
2022-12-26 17:07:03 +00:00
Bill Yi
33f9bd645a
Import translations. DO NOT MERGE ANYWHERE
...
BUG:244160868
Auto-generated-cl: translation import
Change-Id: Ie8a089ca55dc82ff5127494172646a2f6f249610
2022-12-22 19:31:04 +00:00
Zoey Chen
aee115ee3b
[Settings] get wrong toggle when handle the WFC changed
...
WFC toggle's state(EXTRA_TOGGLE_STATE) is set to the newValue after each notifyChange.
However, WFC slice gets the same newValue from EXTRA_TOGGLE_STATE when users change the toggle state
before the EXTRA_TOGGLE_STATE is updated.
Need to get the "correct" new value to set the WFC
Follow the original logic(ag/3820815), 1. don't turn on WFC and only can turn off WFC if activationApp is not null. 2. turn on/off if no activationApp.
Bug: 261922170
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I823f00029c24f1901f40757ba13e7c0f90d6c0bc
2022-12-22 11:13:54 +00:00
Darrell Shi
e722587923
Merge changes from topic "hub-mode-settings" into tm-qpr-dev
...
* changes:
Add top-level Communal settings.
Change screensaver ctrlr to base pref ctrlr.
2022-12-21 08:03:49 +00:00
Darrell Shi
65836b1e3d
Add top-level Communal settings.
...
This change adds a new top-level setting, of which the availability is
controlled by a build time config value. It also registers the new
communal category so that prebuilt packages can inject preferences into
it.
Bug: 261641080
Test: verified on device that communal settings show up on top level
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Idf79ae5b89ecc3498373de56a677b4876fb121c3
2022-12-21 04:10:56 +00:00
Bill Yi
0ce477d1b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-20 06:00:39 +00:00
TreeHugger Robot
d7cc9378fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-20 04:59:24 +00:00
TreeHugger Robot
fb0ce4b83f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-20 04:59:24 +00:00
Arc Wang
669dad7687
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946 -s ours am: cef3637f4c -s ours am: 5772502644 -s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: I81836e226545e8b69971030d88cf137b18617519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:44:34 +00:00
Arc Wang
9990b74f45
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d -s ours am: e3a8b88137 -s ours am: 97bea8ce23 -s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I2530d9f9ff67f5a40a29cf8d0f43537e120a3506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:44:32 +00:00
Arc Wang
e7cf080484
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281 am: dd4f2500b6 -s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 95ff075244 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211
Change-Id: I90c89f36866a3c5ac44b4aa5f1bf7ca6562eeff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:44:26 +00:00
Arc Wang
6d3f3af5d0
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: dc5a992f49 -s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 f964b68fee is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20758918
Change-Id: Idf5810ea235deb0c090695525f635232bfafddbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:44:18 +00:00
Bill Yi
481727404b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6b1d66716be8ffc0eb82d1a335d2ba34c8b692d8
2022-12-19 01:19:11 -08:00
Bill Yi
9e6d50beef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If0e669b10ec6165954a81fdd3e6917a8af5da2dc
2022-12-19 01:17:55 -08:00
Bill Yi
b24f771519
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia5ff9bb6e4a078f53e5494afaec5b14ef42a3812
2022-12-19 01:14:55 -08:00
Arc Wang
5772502644
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946 -s ours am: cef3637f4c -s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: Ie7ef5517d2e0da46d2f69a256b2758a106b74616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:09:13 +00:00
Arc Wang
97bea8ce23
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d -s ours am: e3a8b88137 -s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I7d65d39f1c2db0dbf2e289e49e1f8561ae97d563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:09:10 +00:00
Arc Wang
dd4f2500b6
Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211
Change-Id: I3d26e8d54ebf5ad307f58fb6119c89df33798356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:09:02 +00:00
Zoey Chen
e99f20df58
Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev
2022-12-19 06:20:37 +00:00
Arc Wang
dc5a992f49
Allow 2-pane deep link to access unexported Activity
...
If an Activity is not exported, the Activity still can be
launched by components of the same application, applications
with the same user ID, or privileged system components.
Bug: 261678674
Bug: 250589026
Change-Id: I89b2ae49b3b13f29b0a02cd54291937241f61696
Merged-In: I662df6cb287361b135e2c596abe946ddeb03bda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 03:35:44 +00:00
Bill Yi
9020747917
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-17 01:44:00 +00:00
Darrell Shi
542644e83f
Change screensaver ctrlr to base pref ctrlr.
...
This change makes it that the ScreenSaverPreferenceController extends
BasePreferenceController so that it can be readily used and pointed to
from an xml file.
Bug: 261627295
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: I95487f2f49a23422fff46f30b0cfa287582a547b
2022-12-16 16:49:54 +00:00
Zoey Chen
e45ab97777
[Settings] Add search keywords for APN controller
...
Screenshot: https://hsv.googleplex.com/4816766300585984
Bug: 254024521
Test: atest ApnPreferenceController
Change-Id: I219256efff8d5859d029b190bf2cc73b8e83a746
2022-12-16 11:36:16 +00:00
Arc Wang
cef3637f4c
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946 -s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: I93f85b0182921a010b4bd16f3d7116590144016c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 11:18:17 +00:00
Arc Wang
e3a8b88137
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d -s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I8e350dafebac6347f599d4fbb52100c8e8fa5474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 11:18:13 +00:00
YK Hung
3aca71cfc2
Merge "Move setup optimization mode to main thread" into tm-qpr-dev
2022-12-16 04:53:06 +00:00
YK Hung
c89f78c68f
Merge "Update dock defender helper URL" into tm-qpr-dev
2022-12-16 04:52:18 +00:00
YK Hung
d388dc1809
Merge "Update string for all defenders" into tm-qpr-dev
2022-12-16 04:51:46 +00:00
Bill Yi
d66bae69fc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f902b8eb62ecf275d0b28869ee2fb7cad3c88e4
2022-12-15 20:33:51 -08:00
William Xiao
0be191aeb7
Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev
2022-12-15 20:04:15 +00:00
Yuri Lin
dc4100f148
Merge "Disable zen rule preferences with invalid activities" into tm-qpr-dev
2022-12-15 16:08:17 +00:00
Bill Yi
0d848cb0ac
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-15 14:08:52 +00:00
Wesley Wang
d907a12980
Move setup optimization mode to main thread
...
- Due to unclear root cause of optimization mode being reset after
reboot, update the setup logic from deferred background thread to
main thread, to avoid any possible background task unexecuted case.
Bug: 241735485
Test: make SettingsRoboTests
Change-Id: I2de2181321712f89fadc04bf5000aea91a01485a
Merged-In: I2de2181321712f89fadc04bf5000aea91a01485a
(cherry picked from commit 7423f4390c )
2022-12-15 11:49:14 +00:00