Daniel Norman
1d951d8117
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours am: 8024751b9e
-s ours am: f5ed34f494
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: I906f0038c387d3062cb1df6dae735130a67723f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:53 +00:00
Daniel Norman
0044ecdb7d
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0
am: 41efccc461
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: Iefc2d605f29af788a5ef6e3cb3381c41b621c1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:51 +00:00
Daniel Norman
69fbc355c6
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
am: 4139b9fa1e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I3ad3604b76068825ef76f18f2216b69fa2e86ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:42 +00:00
Daniel Norman
1a28bf00d3
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
am: 51113ad5ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I8d823e7b82a69e924adcc6559289aeb4f46cce04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:22 +00:00
SongFerng Wang
2c57734b06
[automerger skipped] Catch IllegalArgumentException when getting provisioning status am: b781605c1e
am: f8863ca737
-s ours
...
am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 37e1d258f8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28930152
Change-Id: I94ac8291b4d0f319ac1a58015449020e87a7d78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:00 +00:00
Daniel Norman
385ac3fa8a
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563
am: ab7fcdc99a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807176
Change-Id: I5a5d5af46a986e3d8ce1ae437124a56b7f52ca67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:39:00 +00:00
SongFerng Wang
f8863ca737
Catch IllegalArgumentException when getting provisioning status am: b781605c1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28930152
Change-Id: Iab377d3822de137bd5ec8ab7f98d85456218a8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:31:44 +00:00
Daniel Norman
1cf8e553af
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563
am: 2652cb6236
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807176
Change-Id: I4892fd6f3c52d93e4da33e1dc27e5ce6723b89a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:23:46 +00:00
Daniel Norman
1dde2be0b7
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours am: 8024751b9e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: I43be992e04c5a05f4c844464c79ed7f11d3b1e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:23:04 +00:00
Daniel Norman
f5ed34f494
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours am: 8024751b9e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: Ied30a43fcf228c7da92151e163d45ef07ebca961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:23:01 +00:00
SongFerng Wang
b781605c1e
Catch IllegalArgumentException when getting provisioning status
...
getProvisioningStatusForCapability still need the IllegalArgumentException when the subId is -1.
Bug: 346600036
Test: manual test. Disable sim and the settings did not crash.
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37e1d258f88c5129035501d6ced1dab6627da102 )
Merged-In: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
Change-Id: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
2024-08-22 00:20:29 +00:00
Daniel Norman
8024751b9e
[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000
Change-Id: I95295b46d96f7edbf4ea14911083bbde3c2c2f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:52 +00:00
Treehugger Robot
0830cf7fbe
Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: Ia4dbc1a9dfd08e1a210fa047855ec51f972f312f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:50 +00:00
Daniel Norman
41efccc461
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: Ibd262d1e500113d0b29fae776cc950610dcc02db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:47 +00:00
Daniel Norman
ab7fcdc99a
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807176
Change-Id: I5e6ef098392c1d9d5cb87a61bbf39cf4e51095f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:39 +00:00
Daniel Norman
2652cb6236
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807176
Change-Id: I0894ff7c5c10128c096a8a9d161b8e53607a7c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:19 +00:00
Daniel Norman
51113ad5ef
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I701845d7ff26c82b6dda7894e9597bb8929aaf86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:11 +00:00
Daniel Norman
4139b9fa1e
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654
Change-Id: I312e63382e673d3f2661dbf0a82e8181c8aaa6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:07 +00:00
Treehugger Robot
b0b3269725
Merge "Stops hiding a11y services with the same package+label as an activity." into main
2024-08-22 00:03:59 +00:00
Treehugger Robot
5d2e307f6e
Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev
2024-08-22 00:03:59 +00:00
SongFerng Wang
37e1d258f8
Catch IllegalArgumentException when getting provisioning status
...
getProvisioningStatusForCapability still need the IllegalArgumentException when the subId is -1.
Bug: 346600036
Test: manual test. Disable sim and the settings did not crash.
Flag: EXEMPT bugfix
Change-Id: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
2024-08-21 10:28:20 +00:00
SongFerng Wang
db74ac1256
[automerger skipped] Fix IllegalArgumentException when getProvisioningStatusForCapability am: d67de483b4
am: 8761b34cf4
-s ours
...
am skip reason: Merged-In Ib682b336fdfc4c79a8b3e2fa5ccac8fe9c4e7ba1 with SHA-1 370445b773
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28900489
Change-Id: I2e9473d8c92e204d2b6d9740506e479891813a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 08:34:04 +00:00
Treehugger Robot
132b11aaa8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 0f7f296faf
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28893077
Change-Id: I82f61c4c282f32d7e865d3f603fcb49e70769056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 08:28:25 +00:00
Bill Yi
3f0b830176
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ddd2c7953
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28893077
Change-Id: I00277328ae4a14ad3d5b8cb963cb59870fb6fc34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 08:28:17 +00:00
Treehugger Robot
dd030d5048
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 042aab512b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28892112
Change-Id: I137662ace9193596256512726e2aa37bc4e26cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 08:28:12 +00:00
Bill Yi
6b8c7219e5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00dd7dff9c
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28892112
Change-Id: I510354755347d07b54b56ef673bf7962b9a03684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 08:28:06 +00:00
Bill Yi
5ba63c36d5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2125e64a47
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28893137
Change-Id: I92e97c96a9975347033a61c9ec06e8809056be9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 08:24:29 +00:00
SongFerng Wang
8761b34cf4
Fix IllegalArgumentException when getProvisioningStatusForCapability am: d67de483b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28900489
Change-Id: I9e701d326af7239f842611cb0574e18f05a5d34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 08:24:08 +00:00
Bill Yi
4560289e11
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68b9feb5d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28892175
Change-Id: Ie044b9464cefdc0c3b89025ab0c060c4d68e6c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 08:12:22 +00:00
Treehugger Robot
998c72f836
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-08-21 07:56:18 +00:00
Treehugger Robot
3962159cd2
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-08-21 07:56:18 +00:00
Treehugger Robot
827add6f0c
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-08-21 07:56:18 +00:00
Treehugger Robot
0f7f296faf
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-08-21 07:54:25 +00:00
Treehugger Robot
042aab512b
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-08-21 07:54:25 +00:00
Haijie Hong
91536001ba
Merge "Clean up legacy bluetooth setting flags" into main
2024-08-21 05:45:25 +00:00
Quang Luong
d1f3e77793
Merge "Fix NetworkProviderSettingsTest#onWifiEntriesChanged" into main
2024-08-20 23:58:25 +00:00
Xin Li
4b767532d7
[automerger skipped] Merge aosp-24Q3-ts-dev am: fb1de08eff
-s ours
...
am skip reason: Merged-In I52b5a62d20ee7df14ecf93c9b0dbbed6f7dc0f0d with SHA-1 aa0d63ce40
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28853088
Change-Id: I7f187cec076e0a3d8aa1da905571f0b3b5633a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-20 21:40:04 +00:00
Ben Murdoch
8cd5a449dd
Merge "Update "bottom right tap" string to "click"." into main
2024-08-20 14:44:24 +00:00
Matías Hernández
ef4792c811
Merge "Flip the INTERRUPTION_FILTER_ALL switch" into main
2024-08-20 14:06:17 +00:00
Matías Hernández
7424c4c246
Merge "Use the prebuilt manual DND mode from TestModeBuilder in tests" into main
2024-08-20 12:22:38 +00:00
Ben Murdoch
29857065ea
Update "bottom right tap" string to "click".
...
Fixes: 318967325
Flag: EXEMPT string update only
Test: check on device.
Change-Id: Icc996db78e256c02078da0bd600a18f45d4bad73
2024-08-20 11:41:51 +00:00
Haijie Hong
7723d99684
Merge "Catch IllegalArgumentException when unregister callback" into main
2024-08-20 10:39:13 +00:00
Haijie Hong
fa56fb9bbf
Merge "Add device details more settings page" into main
2024-08-20 09:43:30 +00:00
Edgar Wang
fa32f347fe
Merge "[Homepage Revamp] adjust search bar padding" into main
2024-08-20 09:42:49 +00:00
Haijie Hong
52b6929334
Catch IllegalArgumentException when unregister callback
...
BUG: 359585188
Test: local test
Flag: EXEMPT minor fix
Change-Id: Ie2e485b922b2bf1163d47c14040e6e3d48f55f86
2024-08-20 17:17:29 +08:00
SongFerng Wang
d67de483b4
Fix IllegalArgumentException when getProvisioningStatusForCapability
...
The ProvisioningManager.getProvisioningStatusForCapability() throws UnsupportedOperationException when the capability is not supported.
Bug: 346600036
Test: NA
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:370445b773aa7ec69c83904dfdcd2e8f182bb777 )
Merged-In: Ib682b336fdfc4c79a8b3e2fa5ccac8fe9c4e7ba1
Change-Id: Ib682b336fdfc4c79a8b3e2fa5ccac8fe9c4e7ba1
2024-08-20 07:51:56 +00:00
Chaohui Wang
a6d45e93dc
Merge "Settings search for Carrier settings version" into main
2024-08-20 07:50:16 +00:00
Haijie Hong
15a9f1437d
Clean up legacy bluetooth setting flags
...
BUG: 359415806
Test: atest SettingsRoboTests
Flag: EXEMPT clean up
Change-Id: I7c47d80e61cfb0e3b473106e0784cc96ba639452
2024-08-20 15:38:32 +08:00
SongFerng Wang
370445b773
Fix IllegalArgumentException when getProvisioningStatusForCapability
...
The ProvisioningManager.getProvisioningStatusForCapability() throws UnsupportedOperationException when the capability is not supported.
Bug: 346600036
Change-Id: Ib682b336fdfc4c79a8b3e2fa5ccac8fe9c4e7ba1
Test: NA
Flag: EXEMPT bugfix
2024-08-20 05:50:11 +00:00
Chaohui Wang
b3ee1d70c4
Settings search for Carrier settings version
...
Bug: 358238959
Flag: EXEMPT bug fix
Test: manual - search carrier
Test: unit test
Change-Id: I4c13d22a6b689273684ff44df8071789a7a78d6e
2024-08-20 13:22:04 +08:00