Bill Yi
571f09d5a9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
am: 61505e7824
-s ours am: c4894489f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832
Change-Id: Ib6783ea7003080287c8e801822e56560c16af8c7
2021-11-18 19:42:10 +00:00
Bill Yi
c4894489f5
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
am: 61505e7824
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832
Change-Id: I6849598109a72f67c61be1f614e162cf9de38f9d
2021-11-18 19:22:36 +00:00
TreeHugger Robot
08d23b359d
Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8
am: db6bdc35f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: I49ce059279e1e7f3084c187885411d15f4b6494c
2021-11-18 18:33:07 +00:00
Bill Yi
1639e278b3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
am: d86da91c3e
-s ours am: 931145f30e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: I2d5616815c882ac9ba6d2fcdd3f1425dc0835080
2021-11-18 18:33:03 +00:00
TreeHugger Robot
db6bdc35f2
Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: I25e1e2e362a458362025d435667133d37621dd02
2021-11-18 18:08:20 +00:00
Bill Yi
931145f30e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
am: d86da91c3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: Ia5da598d10ce0cf7df291b92b5965363eb878b42
2021-11-18 18:08:17 +00:00
TreeHugger Robot
1ed1be15d8
Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
Import translations. DO NOT MERGE ANYWHERE
2021-11-18 17:51:48 +00:00
TreeHugger Robot
17896e0e7c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78
-s ours am: 6e7435398e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294814
Change-Id: I0a7fc5c781d8d73fbccf99b4409ba2985f253c33
2021-11-18 17:20:03 +00:00
TreeHugger Robot
ff7e972fa7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266
-s ours am: 0b17afd619
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294864
Change-Id: I3f0a50f7dd8d75e9d82cb7a820d0d6bd69e87d74
2021-11-18 17:19:56 +00:00
TreeHugger Robot
6e7435398e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294814
Change-Id: Iabd4701965c8f88c200a616310481fd330114671
2021-11-18 17:02:48 +00:00
TreeHugger Robot
0b17afd619
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294864
Change-Id: Ia12ac51a8a17c860a38f10da88ed70a73928394b
2021-11-18 17:02:38 +00:00
TreeHugger Robot
fda2135c78
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-11-18 16:57:43 +00:00
TreeHugger Robot
277f726266
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-11-18 16:49:54 +00:00
Bill Yi
2c292c3bd0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1374d712733e84b14c7e8d7a030e5a2925e8fa7d
2021-11-18 11:14:31 +00:00
Bill Yi
61505e7824
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832
Change-Id: I1ba27aa6206d0f3397fa2368b2e0a7aee2872242
2021-11-18 11:11:02 +00:00
Bill Yi
10928bfba9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic2a76b26c01ac12d38805cfe0e587bc6578cb031
2021-11-18 11:10:53 +00:00
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
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
b8b0bef8f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iab997959a48aa05243e0d7029dc6a7262414a46d
2021-11-18 10:59: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
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
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
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
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
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
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
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
df8cc34945
Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: 6b81329fc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259258
Change-Id: Iea2dd1448309721f3a57cba3c8c04a0dbae6b4a5
2021-11-17 05:06:07 +00:00
SongFerng Wang
6b81329fc2
Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev
2021-11-17 04:56:04 +00:00
TreeHugger Robot
579723b4b4
Merge "Fix suw display size flicker problem" into sc-v2-dev am: 943d68127c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234666
Change-Id: Iad78a38a429be9a353176c4fcc529d34ec1023bc
2021-11-17 02:08:45 +00:00
Bonian Chen
7dff8c7210
[Settings] Avoid from dialog disappear when click outside
...
Avoid dialog from unexpected close when click out of dialog area.
This create better user experience since user might not click to the
correct area all the time.
Bug: 204020202
Test: local
Change-Id: Ice5cde73eb849f3e5722ab778be41615746210c0
(cherry picked from commit 3cb6a7a705
)
2021-11-17 02:01:42 +00:00
TreeHugger Robot
943d68127c
Merge "Fix suw display size flicker problem" into sc-v2-dev
2021-11-17 01:51:52 +00:00
Gary Jian
782506f61c
Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev am: 7f809bda12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259269
Change-Id: I1de09d91f66438c4ac521ac7624eae41e9b54b34
2021-11-17 01:46:25 +00:00