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
SongFerng Wang
dcc1ee42c3
Merge "[MEP] disable enabled esim profile before set simSlotMapping"
2021-12-23 09:20:02 +00:00
Betty Chang
8bf6efba9e
Merge "To disable Wi-Fi tethering when user restriction is set"
2021-12-23 07:58:48 +00:00
Yomna Nasser
91036f8945
Update "Allow 2G" toggle summary wording.
...
Update "Allow 2G" toggle summary wording to be more clear regarding
the purpose of the toggle and why it may be disabled.
Bug: b/193693810
Bug: b/196183458
Test: manual & atest -c Enable2gPreferenceControllerTest
Change-Id: Iffef8f4f44105de30392c30ffd44c1d62cd066b8
2021-12-23 07:11:36 +00:00
changbetty
efd5d04ab1
To disable Wi-Fi tethering when user restriction is set
...
Bug: 203168953
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Change-Id: I749de121c3918382bf03e437e683477bac23cae1
2021-12-23 02:08:44 +00:00
TreeHugger Robot
ce1f8fdb08
Merge "Make WifiDppEnrolleeActivity launches explicit" into sc-v2-dev am: b94ae9ffb3
am: de8493a8ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16509324
Change-Id: I9d63e4dd72b2e0198ab1178fb765bba2361df664
2021-12-22 19:32:09 +00:00
TreeHugger Robot
de8493a8ee
Merge "Make WifiDppEnrolleeActivity launches explicit" into sc-v2-dev am: b94ae9ffb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16509324
Change-Id: I85beb9352125aaa74df850853b81a1f9f82b24d0
2021-12-22 19:19:14 +00:00
TreeHugger Robot
b94ae9ffb3
Merge "Make WifiDppEnrolleeActivity launches explicit" into sc-v2-dev
2021-12-22 18:43:39 +00:00
Patrick Huang
2dc486bd62
Merge "Add config for showing/hiding emergency setting entry"
2021-12-22 18:32:31 +00:00
Tomasz Wasilczyk
00e29015f9
Don't crash Network settings if Wi-Fi is not supported.
...
Bug: 209906859
Test: flash & boot wifi-less device
Change-Id: If212e7a667e60812c14ece9ef4386de0efb606c2
2021-12-22 10:00:44 -08:00
Bill Yi
ae3198be93
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I990751fa47191c170d7def2a005f94e688f2e7c5
2021-12-22 17:47:24 +00:00
Bill Yi
778c36e32e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8615103b5a4df25008ca6ee5d3d5991a6ade0d1d
2021-12-22 17:43:28 +00:00
Bill Yi
4948c670f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib5db99d68b52f343bdc999deb666780690faec52
2021-12-22 17:39:39 +00:00
Bill Yi
8ca6fcd384
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If72ca8dbe5b6f5936c389b8e5607e20101e2eaf8
2021-12-22 17:35:42 +00:00
Bill Yi
296eed7cba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib857a627605813328a0417897a4043923463e2ba
2021-12-22 17:32:06 +00:00
Bill Yi
bd0b96b416
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2b61f14067ea07e12fa8bdd3f88e15e9eb39dca5
2021-12-22 17:30:18 +00:00
Bill Yi
d271043a53
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I818be87c0115b75678e405d76dcd261251422473
2021-12-22 17:28:35 +00:00
Bill Yi
f25944241e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92211aa4ba463e494958c0df4745252dfba741ac
2021-12-22 17:26:54 +00:00