TreeHugger Robot
f719069efe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073
-s ours am: c50a74bcaf
-s ours am: 56abfbd85e
-s ours am: 706377914a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521211
Change-Id: I843b30172470e050bba3037deb5b18a56fbd62b7
2021-12-23 19:11:34 +00:00
TreeHugger Robot
f44c1d72af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f
-s ours am: 179503712b
-s ours am: fc17324c33
-s ours am: b170b76039
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521202
Change-Id: I15861f6e1ee932a03ce83cce193bf0b1a4b07810
2021-12-23 19:10:59 +00:00
TreeHugger Robot
8802be017f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073
-s ours am: c50a74bcaf
-s ours am: cb71dbf3e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521211
Change-Id: I5541c61a24b65093de2883c9c61d571bba7a0d9a
2021-12-23 19:10:43 +00:00
TreeHugger Robot
58a8bd62b8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f
-s ours am: 179503712b
-s ours am: 77fd150a83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521202
Change-Id: Id6e37afcd7ce4c4cb30cc480634d9e3e11eb8d68
2021-12-23 19:10:34 +00:00
TreeHugger Robot
66dec867d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 131de319c0
-s ours am: dee124c7fb
-s ours am: 50f744d940
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521212
Change-Id: Ic880f6e236cfddcfe07694c5f7c57a5e8820a2ac
2021-12-23 19:10:24 +00:00
TreeHugger Robot
980281a878
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1f5c8ea55d
-s ours am: 66e2620e69
-s ours am: f490840574
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521203
Change-Id: Ieb21b0a707c7be4ddf93ff6fcb021ab1c412bb86
2021-12-23 19:09:48 +00:00
TreeHugger Robot
d93fdfcebe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 131de319c0
-s ours am: cefa2d5659
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521212
Change-Id: I799d9cf18822ef54af73ca568d4c7f8d0a9c4c96
2021-12-23 19:09:24 +00:00
TreeHugger Robot
45b842219a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c22a52aac3
-s ours am: 0bf96c63d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521204
Change-Id: I2ac010bc479fb1ad5c70a52cbd05f5f4d8711349
2021-12-23 19:09:22 +00:00
TreeHugger Robot
2b69c30add
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 71ae518c88
-s ours am: 0223233e6c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521213
Change-Id: Id94478ae2b1e39eed3ac5bdde33c250c144beb8a
2021-12-23 19:08:38 +00:00
TreeHugger Robot
f4e4cf4649
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1f5c8ea55d
-s ours am: daf4f6397a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521203
Change-Id: Id97fce4f5edd62cde36495e1b7e58851e1b66594
2021-12-23 19:08:20 +00:00
TreeHugger Robot
706377914a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073
-s ours am: c50a74bcaf
-s ours am: 56abfbd85e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521211
Change-Id: I8ec2875ef37e92bc1120a7fdb64aeca0e448be97
2021-12-23 19:05:04 +00:00
TreeHugger Robot
b170b76039
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f
-s ours am: 179503712b
-s ours am: fc17324c33
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521202
Change-Id: Ic2efffb5cf8beffd3fda25df67f35e0464017673
2021-12-23 19:03:42 +00:00
TreeHugger Robot
50f744d940
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 131de319c0
-s ours am: dee124c7fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521212
Change-Id: I9617a356d1b080ca17be43055f3634d7a15a472c
2021-12-23 19:00:00 +00:00
TreeHugger Robot
f490840574
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1f5c8ea55d
-s ours am: 66e2620e69
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521203
Change-Id: I89ee13a2c0b6e90c45e31f84c67027e4d93306c5
2021-12-23 18:57:36 +00:00
TreeHugger Robot
56abfbd85e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073
-s ours am: c50a74bcaf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521211
Change-Id: I15420369fe1a10e5fa96f691048f8fd539cfc1f5
2021-12-23 18:52:44 +00:00
TreeHugger Robot
fc17324c33
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f
-s ours am: 179503712b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521202
Change-Id: Iaf89469c4694cef78731069526f532174babc599
2021-12-23 18:52:30 +00:00
TreeHugger Robot
cb71dbf3e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073
-s ours am: c50a74bcaf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521211
Change-Id: Ia2b11772d87619d00ef69310f3baab1842dd30a4
2021-12-23 18:51:01 +00:00
TreeHugger Robot
77fd150a83
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f
-s ours am: 179503712b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521202
Change-Id: Ief4a6f4c5ba0deb79fb26d63e0f7201f4ef459a3
2021-12-23 18:50:55 +00:00
TreeHugger Robot
dee124c7fb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 131de319c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521212
Change-Id: I48449a1f33fceb37ba855e2bf2c5c8d63b2e87de
2021-12-23 18:50:52 +00:00
TreeHugger Robot
cefa2d5659
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 131de319c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521212
Change-Id: Idbbe39e560ba4b09eb7551e257597999767dc747
2021-12-23 18:50:16 +00:00
TreeHugger Robot
bcad02f669
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073
-s ours am: 6ff85a80dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521211
Change-Id: I3b02bd9c8e8f4fbe553b6c86bbe1232fb5f38bdc
2021-12-23 18:50:15 +00:00
TreeHugger Robot
736189f2ea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f
-s ours am: dbcc1d6424
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521202
Change-Id: Ie106bb8df4db9a3e89e1b2f9b7eeb5560434a4a9
2021-12-23 18:49:48 +00:00
TreeHugger Robot
26bf2f4262
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3a43b0cd0e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16520455
Change-Id: I3d821f8d12d111bc88316e9c7f529864636885a7
2021-12-23 18:49:18 +00:00
TreeHugger Robot
daf4f6397a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1f5c8ea55d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521203
Change-Id: Ifbd1f12ef61201e1c68d29d792e1dd30617fc3a7
2021-12-23 18:49:15 +00:00
TreeHugger Robot
66e2620e69
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1f5c8ea55d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521203
Change-Id: I45f01539eb1171b44e0d2833e169ea93bb4edea5
2021-12-23 18:49:12 +00:00
TreeHugger Robot
c50a74bcaf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521211
Change-Id: I134d52b57e5f67b7a5cb1e42e0b9d64230a3d10f
2021-12-23 18:49:07 +00:00
TreeHugger Robot
179503712b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521202
Change-Id: I4b57db49100b629d44c91ee3a83f9d0eb504336d
2021-12-23 18:48:48 +00:00
TreeHugger Robot
0bf96c63d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c22a52aac3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521204
Change-Id: Ic074699ad78ea5a347cddaf6ac2eb7a858a29c8e
2021-12-23 18:48:34 +00:00
TreeHugger Robot
8be9297af9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 722e3e110d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16520454
Change-Id: If5ab201fbd94ab9320f85e92936e3898756978b3
2021-12-23 18:48:21 +00:00
TreeHugger Robot
6ff85a80dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521211
Change-Id: I3f00fb9b9053038b136a727bec75bf9d76e3e602
2021-12-23 18:48:01 +00:00
TreeHugger Robot
dbcc1d6424
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521202
Change-Id: I12fe8797e08fafc6c474c283a470e8a11b4ed65d
2021-12-23 18:47:50 +00:00
TreeHugger Robot
0223233e6c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 71ae518c88
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16521213
Change-Id: Ifac1c58afc0febd701d522331321c35453826a55
2021-12-23 18:47:32 +00:00
TreeHugger Robot
551dbe78d3
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-12-23 18:20:41 +00:00
TreeHugger Robot
3a43b0cd0e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-12-23 18:20:38 +00:00
TreeHugger Robot
cbff549073
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-12-23 18:20:34 +00:00
TreeHugger Robot
ea3917df6f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-12-23 18:20:30 +00:00
TreeHugger Robot
131de319c0
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-12-23 18:20:15 +00:00
TreeHugger Robot
1f5c8ea55d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-12-23 18:20:13 +00:00
TreeHugger Robot
c22a52aac3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-23 18:19:58 +00:00
TreeHugger Robot
71ae518c88
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-23 18:19:57 +00:00
TreeHugger Robot
cf192bdfa6
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-12-23 18:17:14 +00:00
TreeHugger Robot
722e3e110d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-12-23 18:17:06 +00:00
TreeHugger Robot
effd2871c7
Merge changes from topic "presubmit-am-587ad354e0934977a11ff5786601e88f"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1ead3d51a1
Import translations. DO NOT MERGE ANYWHERE
2021-12-23 18:17:06 +00:00
Evan Chen
ca2d21416d
Update bluetooth setting for AssociationInfo
...
Bug: 205738945
Test: Manually test
Change-Id: Id46b2632abe7b44fe8d0538a4b58e273c913c889
2021-12-23 17:52:01 +00:00
Yomna Nasser
c17bef1711
Merge "Update "Allow 2G" toggle summary wording."
2021-12-23 15:43:05 +00:00
Zoey Chen
8349ee6a7b
[Settings] Should back to previous page when removing the SIM (subinfo is null)
...
Test: atest
Bug: 211843783
Change-Id: I5fc2ecdf26848af246baab42a11c239a7aa82ee1
2021-12-23 13:29:37 +00:00
tom hsu
4da192d732
[Panlingual] Remove getCallingPackage and use Uri instead.
...
- Use uri to pass the package name.
- Allow adb command to start this function
Bug: 211856852
Test: see b/211856852#2
Change-Id: I3d73d32d7546bf0e3db25d952b2caee934f523dc
2021-12-23 13:00:28 +00:00
TreeHugger Robot
11070ba729
Merge "[Settings] Can not launch SIMs page correctly"
2021-12-23 11:07:24 +00:00
Yuri Ufimtsev
4eea126959
Group some Security settings to a separate "Advanced settings" screen
...
Test: adb shell am start -a android.settings.SECURITY_SETTINGS opens Advanced
Security Settings screen
Test: atest SettingsUnitTests:SecurityAdvancedSettingsTest
Test: atest SettingsUnitTests:SecurityAdvancedSettingsControllerTest
Bug: 204416998
Change-Id: If9c6da812ffb7c046b3b00a084007950801e1d4f
2021-12-23 10:26:46 +00:00
Zoey Chen
0d89c09b3f
[Settings] Can not launch SIMs page correctly
...
The subId should be set from argument when launching MobileNetworkSettings by new SubSettings
Test: atest
Bug: 211843783
Change-Id: Ie2b675af278795930971c61d8b1c1c28b96bf0ee
2021-12-23 09:30:11 +00:00