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
Zoey Chen
d6bf9262b5
[Settings] get wrong toggle when handle the WFC changed am: aee115ee3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806352
Change-Id: Icf924f45689bfa0906661be1bfee032520cafab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-23 05:11:39 +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
Sandeep Jawalkar
3279e1a211
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 749c2dddbc
am: aa0205daf9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361542
Change-Id: I663ea43a6e1e06b456a5a024bc7773e10cd03a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-22 04:26:13 +00:00
Sandeep Jawalkar
aa0205daf9
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 749c2dddbc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361542
Change-Id: I8fc86403f5dc64beec53d6c93d09f8c0dd3a2f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-22 03:52:50 +00:00
Sandeep Jawalkar
749c2dddbc
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary"
2022-12-22 03:15:34 +00:00
sandeepjs
beab3c0d43
[Android U][eSIM] Modify esim and sim card strings as part of esim primary
...
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126
Test: build
Bug: 257380320
Change-Id: If2183945054255d52e89a61a04db25edd725a73d
2022-12-21 12:01:01 +00:00
changbetty
09a6899fc2
Change the intent flag to immutable
...
Bug: 256590210
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I68132f863027fab19351b4fdbc363e5c274e3327
2022-12-21 10:16:10 +00:00
Darrell Shi
2287f6e2e9
Merge changes from topic "hub-mode-settings" into tm-qpr-dev am: e722587923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736115
Change-Id: I17bc2f1b210dd0262299cfe10c6c12f2c94cca4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 08:23:55 +00:00
Darrell Shi
955a2f2ac3
Change screensaver ctrlr to base pref ctrlr. am: 542644e83f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736682
Change-Id: Ic6f282087660ede4a0b1fd38378c0c5adc58bc3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 08:23:48 +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
Daniel Norman
c01da5ab7e
Merge "Update OWNERS for A11y Settings to include myself & remove others." am: 5394ffdd9d
am: 38b5b5d994
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362352
Change-Id: I38b7ae19c2b6f1807f04b4b2a294569a922b16e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 19:32:38 +00:00
Daniel Norman
38b5b5d994
Merge "Update OWNERS for A11y Settings to include myself & remove others." am: 5394ffdd9d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362352
Change-Id: Ie1d066d2f331a830cfad9d23064f4f942fb28024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 18:56:02 +00:00
Daniel Norman
5394ffdd9d
Merge "Update OWNERS for A11y Settings to include myself & remove others."
2022-12-20 17:57:16 +00:00
Bill Yi
f1c44c2414
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0ce477d1b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20781598
Change-Id: I4169fea5c14a15bc2fba79dbeb4ee9872d613a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:14:52 +00:00
Bill Yi
99aef9fd27
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e6d50beef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20781598
Change-Id: I7fef6931550827ef6dcd57b79afa761e17191777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:14:05 +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
0abed076d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d7cc9378fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782929
Change-Id: Ied799cc46bfe78038153363953e9768f9c7caf45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 05:45:43 +00:00
Bill Yi
94246084a3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 481727404b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782929
Change-Id: I9dc85e04fa9f4fd6bba0479c4f5b2953c9093333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 05:45:32 +00:00
TreeHugger Robot
de200625dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fb0ce4b83f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782928
Change-Id: Ie37f5ec1e0256c971162334e6fd0e7ea56348817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 05:45:21 +00:00
Bill Yi
37bae5ee08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b24f771519
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782928
Change-Id: Id81371006dc858e249351a05c41290ffef86e4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 05:45:02 +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
Daniel Norman
6b8778a40c
Update OWNERS for A11y Settings to include myself & remove others.
...
Change-Id: Ia63248cfb74218a6d7f95150d379f7024f162dbb
2022-12-19 23:49:59 +00:00
Sorin Basca
93c143ed0a
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-12-19 22:24:45 +00:00
Arc Wang
eb6daa6e20
[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: 669dad7687
-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: Ic3f9b03f963d60a1c6fbc951ab52f0c6ac65a35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 10:27:35 +00:00
Arc Wang
5f5d3b2244
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d
-s ours am: e3a8b88137
-s ours am: 97bea8ce23
-s ours am: 9990b74f45
-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: Ie3b2f15238b19d0603c73f73afce9dd30e67ba14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 10:27:30 +00:00
Arc Wang
3e121b1f94
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281
am: dd4f2500b6
-s ours am: e7cf080484
-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: I418242cedb602f305de2d38b031c7c3557f5c850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 10:27:21 +00:00
Arc Wang
13e169b972
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: dc5a992f49
-s ours am: 6d3f3af5d0
-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: I0f1ed5ff1893fcf896c01f9af74fb9e4896ca937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 10:27:10 +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
c76250cd50
Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am: e99f20df58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20747651
Change-Id: I2ea8ed881d1bcd91427f44b0fb866195fa289b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 07:04:37 +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
b0955301eb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9020747917
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20754698
Change-Id: I46fba36a7bcc8f6ba96375b2c9f08872bbd71f23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:36:11 +00:00
Bill Yi
5a66983019
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d66bae69fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20754698
Change-Id: Ia769220dd82f6662552d7a998adfa8d7a8ac0e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-17 02:35:51 +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