Chaohui Wang
046eada25e
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: 19356dae5d am: 74030a5bc5 am: f75897acd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: I8c3b09809c23a65129075ae001c286bf36ebee7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:18:02 +00:00
Tom Hsu
79e8a03137
Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 am: 169517aacc am: 3521d0420c am: 71b96c18e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882
Change-Id: Ia4be127d847c382f082d0c4f942855c76966424d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:17:47 +00:00
TreeHugger Robot
56012b6bb0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I93430c476feecdd32599576cefe10738155909b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:17:09 +00:00
TreeHugger Robot
b30ca6974e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: Ib62e260acff5d5752062eb6992b4aa666be6eaf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:16:43 +00:00
Bill Yi
4970b3783e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I83d9202789b11983a8bf6e1c2d157330e16c8fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:16:32 +00:00
Bill Yi
d3d4832f60
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: I75373ff6bfe903e80e6eac9f016466e973474ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:16:00 +00:00
TreeHugger Robot
414ba3666c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: Ie7ad30cf6c51e704ee9ef1cdefa08848274ff7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:15:20 +00:00
TreeHugger Robot
93a954046f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I637f9d638000e16c1ca16fb15375826069152cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:14:59 +00:00
Bill Yi
2a9a803489
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18104364
Change-Id: Ibebfbe157b332db17626ce33651f157a551e7969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:14:54 +00:00
Bill Yi
6944f72f53
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I7a46b2d7667905a79a7eebbe979167545e40865c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:14:35 +00:00
Arc Wang
aa4ed4d454
Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a am: 7a530c79ec am: 3af1d90a43 am: 2c4a835b27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167
Change-Id: Ib2cb37141b2529801dc3d9d3194b9a56dad4edd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 00:55:22 +00:00
Julia Reynolds
d445fe4252
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: 1f912cbfe3 am: d9d09bf112 am: a7c0ce5cae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I1f5c6c718dd5690af4a6965d905d8997cd313f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 00:21:07 +00:00
TreeHugger Robot
e8650ff934
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 6708570e2c am: d266df1531 am: a00a24bace
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: I23da6999595cd81c735734d0c422844825438700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 00:20:53 +00:00
Calvin Pan
747688b636
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 38fac79ee6 am: 492fdaf058 am: 3e087ae99d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: Id404a57859b3dc049967e2ae39962f97a0e716ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 00:15:38 +00:00
Betty Chang
65fbc878a2
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: ec17c47421 am: 3ea06f174e am: 8ed506d860
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: Ib5c4b12d00956d6855839552db03ebab01b1564e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 00:13:25 +00:00
TreeHugger Robot
650ff58d75
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-05-03 23:31:48 +00:00
TreeHugger Robot
81b94adb78
Merge changes from topic "tc_change_32"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4d117cbc4
Import translations. DO NOT MERGE ANYWHERE
2022-05-03 23:31:48 +00:00
TreeHugger Robot
1640f6f7aa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-05-03 23:31:48 +00:00
TreeHugger Robot
87e365c6e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours am: 053bd1f8ba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108743
Change-Id: Icbbf82b813a3710d983fb667343205903f568ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 21:59:19 +00:00
Bill Yi
7f13849ae7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours am: 1025a9751f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108743
Change-Id: I100b6d0889e501acf1d33a287e98d046b2c97127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 21:59:05 +00:00
TreeHugger Robot
0f6f7464fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099397
Change-Id: I9fc143a21e0d6640577be9a66ca467ec32e06cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 21:20:42 +00:00
Bill Yi
178808f178
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099397
Change-Id: I584bcc0994dec00a847db344c5862781575c66ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 21:20:30 +00:00
TreeHugger Robot
e8a5cb6abf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108743
Change-Id: Id21a2bca3c5bf57d2afeeb77a0264f32e45ced34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 21:05:08 +00:00
Bill Yi
ce985a63f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108743
Change-Id: Ifc7b78ee0ea027944273035763749d0af7a4b65e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 21:04:39 +00:00
TreeHugger Robot
341a2953e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099397
Change-Id: I85cd0b7257faf828bdddc4139510757047829e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 21:02:03 +00:00
Bill Yi
bfb7bb08ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099397
Change-Id: Ib5b2d6adaff63ca1bf03755d251d23fb99955a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 21:01:47 +00:00
Xin Li
c3a9ea7443
Merge SP2A.220505.002
...
Bug: 231319788
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
Change-Id: I225d05e638e099971b596b8ceeb8bf7bcd8778bd
2022-05-03 20:53:03 +00:00
Bill Yi
9aefbd74f6
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-05-03 20:49:52 +00:00
TreeHugger Robot
053bd1f8ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108743
Change-Id: I5430188911ae3f1c178a87369f7f1a20f47b1c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 20:49:40 +00:00
Bill Yi
1025a9751f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108743
Change-Id: Ic6c9925cdfc653205b4c4377c19848ea74eee704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 20:49:11 +00:00
TreeHugger Robot
c5148a79ad
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-03 20:49:10 +00:00
TreeHugger Robot
d802445bc2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-03 20:48:56 +00:00
TreeHugger Robot
c714da6092
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-03 20:48:33 +00:00
TreeHugger Robot
d8d5dc02d5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-03 20:48:07 +00:00
TreeHugger Robot
5cc53736d8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-03 20:47:12 +00:00
TreeHugger Robot
c63cd3cce5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-03 20:45:40 +00:00
TreeHugger Robot
43ba3f6310
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-03 20:45:18 +00:00
TreeHugger Robot
d1110a4dec
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-03 20:39:04 +00:00
Weng Su
9dfbd9dab8
Remove Wi-Fi toggle in settings search
...
- Remove Wi-Fi toggle preferences in settings search if Wi-Fi state is disallowed to change
- See the result screenshot in b/203168097#comment29
Bug: 203168097
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ibe352f3ec3413fb0774de0b2bd213bb705e919e0
2022-05-04 04:01:47 +08:00
Neil Fuller
3bb5fc5da8
Merge "Capitalize TZ display name strings" am: 6a44151bc1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886
Change-Id: Iaead2dab59a3641905f62c472aee78546eb312bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 19:27:41 +00:00
Neil Fuller
6a44151bc1
Merge "Capitalize TZ display name strings"
2022-05-03 19:22:03 +00:00
Bonian Chen
7ca3689b23
Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: cf9ca3fbe6 am: 61c633f9a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662
Change-Id: I0e20d8fc701e2d8ef0034f729bae2b772d328242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 18:50:51 +00:00
Bonian Chen
a277c7a641
Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: d4440db4bf am: b0e84295b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902
Change-Id: I42c8bc63a1b788d33c907f2e9187d524c4c846f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 18:50:44 +00:00
TreeHugger Robot
1e3ddc9460
Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: 23dab0bb02 am: 24f5f6d56c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022
Change-Id: I70231e2631700c0b52c528e68d2bda92dc3faa2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 18:50:37 +00:00
TreeHugger Robot
f606826199
Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: c916acb354 am: eacedb46b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633
Change-Id: Icaf417f44ab9cd94b1928fa1e7672ce2232f7902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 18:50:31 +00:00
Bonian Chen
b88cb65959
Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: 99724f3a70 am: b2e6fce2fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786
Change-Id: I2dc2443aa7cb9823dfb02c42e4284e8496ef1250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 18:50:24 +00:00
Betty Chang
166d876738
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: b1fa93e7ef am: d7e9bcc43f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: I8b4d682f657f61dc6dbf3850a5d38d347682b4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 18:50:17 +00:00
Edgar Wang
05255129d2
Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 22f7ab59c0 am: 2336ad01a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962
Change-Id: I7b0e1863257ff579131ac7d2a60323004efaac68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 18:50:11 +00:00
Bill Yi
c1eae1df36
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: 551016f43b -s ours am: 41b6a6c820 -s ours am: a82a1ff84e -s ours am: 2e250b15ae -s ours am: 7cb788de49 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: If0c452c3dd20a02ee292c5a32b81b07b9ad8d794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 18:50:03 +00:00
Bill Yi
447f3eb1cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: b8d61f99e0 -s ours am: 10abd90819 -s ours am: 4cef0633cc -s ours am: 61f36c7be1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Iee56c1e74644c8de7ef8d297f05bcbef1f1da201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 18:49:54 +00:00