Bill Yi
c3da08f9b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I14e8407dfd64beac27fc43769f7009427f477027
2021-11-18 11:01:28 +00:00
Bill Yi
ec854d1d31
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
2p: a4d089c738
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: I9a3f6328f7c0cdfed687173183e2247d3e6eb620
2021-11-18 11:00:11 +00:00
Bill Yi
d86da91c3e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: I1988d2aea846cc00ec8929d7e898f821a686c5cc
2021-11-18 11:00:03 +00:00
Bill Yi
a4d089c738
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: Ic42dc91bbba1f38ab4b6ec1a0dc9a5c20dd74610
2021-11-18 11:00:03 +00:00
Bill Yi
b8b0bef8f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iab997959a48aa05243e0d7029dc6a7262414a46d
2021-11-18 10:59:55 +00:00
Bill Yi
50f846f159
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I283f70ea9e3e4c2092c3b0d044abb524f14d6233
2021-11-18 10:58:23 +00:00
Bill Yi
428a285829
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I12a53b0b2120d995bd75eb25e9b0f1d006af8d86
2021-11-18 10:55:43 +00:00
Bill Yi
3cb4a606cb
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b25362f540
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294735
Change-Id: Ibdc90746222efdc9f2fbd583bd8c3fb4b488b2fa
2021-11-18 10:52:18 +00:00
Bill Yi
b25362f540
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e1a0be4a803f0a0ff07474df142d97139f304dc
2021-11-18 10:52:11 +00:00
Betty Chang
8ed7411e88
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8
am: 4375590837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228
Change-Id: Ie89df57dc909dd6e7272c799bfd390a476b2a4cd
2021-11-18 06:47:22 +00:00
Betty Chang
38874a5fd7
Merge "Remove the string for wifi toggle summary" into sc-v2-dev am: 34ff040431
am: 023e325653
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279915
Change-Id: I73b425791f6f81dcd0538399d8449aa8ca29dd38
2021-11-18 06:47:11 +00:00
Jason Hsu
0a8f978357
Merge "Provide ability to link to Color Inversion page via Intent" into sc-v2-dev
2021-11-18 06:33:55 +00:00
Betty Chang
4375590837
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228
Change-Id: I06611c86c0db787198031edcf10d1d60217d577c
2021-11-18 06:30:27 +00:00
Betty Chang
023e325653
Merge "Remove the string for wifi toggle summary" into sc-v2-dev am: 34ff040431
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279915
Change-Id: Id0a6f3124c0df3332f4b808ba7251a181f0bb483
2021-11-18 06:30:05 +00:00
Betty Chang
21967a6ff8
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev
2021-11-18 06:18:08 +00:00
Betty Chang
34ff040431
Merge "Remove the string for wifi toggle summary" into sc-v2-dev
2021-11-18 06:17:52 +00:00
TreeHugger Robot
e4dca4c6db
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
am: 2fc75eba80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888
Change-Id: Ib2df8aa1538faf51d375dc92cc978039f0da9768
2021-11-18 03:52:25 +00:00
TreeHugger Robot
2fc75eba80
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888
Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768
2021-11-18 03:41:27 +00:00
TreeHugger Robot
b84b7d586a
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev
2021-11-18 03:25:05 +00:00
Jason Chang
a40471e4bf
Merge "(3/n) Handling long-pressed action for One-handed mode Quick Settings tile"
2021-11-17 23:38:03 +00:00
Matt Pietal
a5415907ea
Allow a settings override for double-line clock
...
This setting allows users to always show a single-line format clock,
regardless of notification status.
Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 19:29:19 +00:00
Makoto Onuki
694d374a9c
Merge "Use different exceptions for different crash reasons" into sc-v2-dev am: fcb067b577
am: 0fefda6870
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276438
Change-Id: I81b0c86610090a295801fb13295b15b94a501ba6
2021-11-17 18:11:17 +00:00
Makoto Onuki
0fefda6870
Merge "Use different exceptions for different crash reasons" into sc-v2-dev am: fcb067b577
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276438
Change-Id: I8629b6ad36ffc18364a09f859497fecd93368b98
2021-11-17 18:05:05 +00:00
TreeHugger Robot
8027459563
[automerger skipped] Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev am: b13b2fd8ee
am: 6274ca81fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: Ieede0d8433136aac3c6585c9b060d60264e9b2b5
2021-11-17 18:00:07 +00:00
Matt Pietal
4942988d02
[automerger skipped] [DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486
am: d8ca5298ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: I0babc7ed0c88806d5763cb97af0fe43f4c43c59c
2021-11-17 18:00:04 +00:00
Makoto Onuki
fcb067b577
Merge "Use different exceptions for different crash reasons" into sc-v2-dev
2021-11-17 17:52:56 +00:00
TreeHugger Robot
6274ca81fa
Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev am: b13b2fd8ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: I243c8725d48e167e32785ab08ce40864588f1746
2021-11-17 17:41:28 +00:00
Matt Pietal
d8ca5298ec
[DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: Ic95e5a3863b64a2fda813500335ac04db8d6ae56
2021-11-17 17:41:24 +00:00
TreeHugger Robot
b13b2fd8ee
Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev
2021-11-17 17:12:37 +00:00
changbetty
39ebb7c9a8
Remove feature flag for provider model in wifi settings
...
Bug: 206338507
Test: manual test
Change-Id: I1ec83c94f801b489bcc716a6d78cbe7beab9638f
2021-11-17 15:57:14 +00:00
changbetty
14d1b41464
Remove the string for wifi toggle summary
...
Bug: 204124091
Test: Manual test
Change-Id: I0d1d7d6061b756a09942ce7cb0f66a1b1c962eb1
2021-11-17 15:18:22 +00:00
ykhung
ac655e430e
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
am: 938a8bbd26
am: b84a0ed81a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: I6a61887e8b6af8f80a41eb7588ec89a33ce1950c
2021-11-17 14:41:11 +00:00
ykhung
57a9e1b17e
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
am: 3c1da6b2af
am: 394a0c96fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: Ic035904fd3d9084d5cb82e274bb451510d4fd2bd
2021-11-17 14:41:04 +00:00
ykhung
b84a0ed81a
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
am: 938a8bbd26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: I522a6d7cf980aa12cfd1362c6b901470001ade6c
2021-11-17 14:31:09 +00:00
ykhung
394a0c96fb
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
am: 3c1da6b2af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: I8ded2a15907927eaf5efb90e59405cd22d885ee8
2021-11-17 14:29:25 +00:00
ykhung
938a8bbd26
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: Id3d70a338b081edd45c8ca6c1f7fc7e4e41707e9
2021-11-17 14:19:23 +00:00
ykhung
3c1da6b2af
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: I7588c48981e0a4f351302fd1b38f8c943509375a
2021-11-17 14:19:22 +00:00
Matt Pietal
cb4836b486
[DO NOT MERGE] Allow a settings override for double-line clock
...
This setting allows users to always show a single-line format clock,
regardless of notification status.
Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 13:34:36 +00:00
ykhung
13a52a081e
Update "Mobile network standby" attribute label into "Mobile network"
...
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
(cherry picked from commit 22dc875ba7
)
2021-11-17 12:35:23 +00:00
TreeHugger Robot
69df012025
Merge "Fix the CtsVerifier issue" into sc-v2-dev am: 0d96dc50b5
am: e837096e38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241533
Change-Id: Id31d0aa8a6a50ca8d4b7c997b06ee86b19e0866e
2021-11-17 09:25:32 +00:00
TreeHugger Robot
e837096e38
Merge "Fix the CtsVerifier issue" into sc-v2-dev am: 0d96dc50b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241533
Change-Id: I87216a56ee6cd70ccf6af2318ccafec50642161a
2021-11-17 09:15:06 +00:00
TreeHugger Robot
0d96dc50b5
Merge "Fix the CtsVerifier issue" into sc-v2-dev
2021-11-17 08:58:43 +00:00
SongFerng Wang
ff0058b256
[automerger skipped] Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev am: f0a3348ceb
am: 9a7f3aaf0e
-s ours
...
am skip reason: Merged-In I163ab8e966de57ddff7939a46fc47b05bea029e3 with SHA-1 f0575366c4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262279
Change-Id: I93656395e0b051dd536c5bbf5f268e4de82c3cf7
2021-11-17 07:14:36 +00:00
SongFerng Wang
9a7f3aaf0e
Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev am: f0a3348ceb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262279
Change-Id: I38ea72134e9f0bf453d6125763e4d6af6f323487
2021-11-17 06:55:17 +00:00
SongFerng Wang
f0a3348ceb
Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev
2021-11-17 06:42:29 +00:00
SongFerng Wang
f5e2d52f43
Merge "Revert "Device do network scan after user rotates NetworkSelection page""
2021-11-17 06:24:53 +00:00
Bonian Chen
f9c230bdc8
Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev am: fd6ddcd050
am: a77928c6f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16278918
Change-Id: I24fe78f83a7fea2e9baa1269b017a55ed3bdfc2c
2021-11-17 06:12:21 +00:00
Bonian Chen
a77928c6f4
Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev am: fd6ddcd050
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16278918
Change-Id: I80c2ae9f28c8b34579dd883f1976116ac47c47de
2021-11-17 05:55:21 +00:00
Bonian Chen
fd6ddcd050
Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev
2021-11-17 05:28:34 +00:00
SongFerng Wang
14351731fa
Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: 6b81329fc2
am: df8cc34945
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259258
Change-Id: I1973f7d7c2aefe5932e916b1c125d3348a437bda
2021-11-17 05:22:07 +00:00