Matt Casey
7e73280edf
Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1
am: 83ab0dea1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842
Change-Id: Id590eeb769092c78830d329cb3c5991d4829b317
2021-06-07 14:47:41 +00:00
Matt Casey
83ab0dea1d
Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842
Change-Id: I939fe3a8d5ba3dfd8a72503315f939b41b0345cb
2021-06-07 14:33:09 +00:00
TreeHugger Robot
203ab249ae
Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060
am: 74eb92ea6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370
Change-Id: Ia8283bd5ea214212434af8fd37fefdb9a6c80004
2021-06-07 14:17:55 +00:00
Matt Casey
bd1c4e5fa1
Merge "Fix typo in setting description." into sc-dev
2021-06-07 14:17:15 +00:00
TreeHugger Robot
5194e04d3b
Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060
am: 8b53f6ba7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370
Change-Id: Ie10d45c0508886cdbb8ede258998e9fef3a35952
2021-06-07 14:17:05 +00:00
Matt Casey
7364e42f74
Fix typo in setting description.
...
Repeated word
Test: None
Bug: 179673792
Change-Id: Iee75c37fce90e1c05f651d741374029c213fa0f0
2021-06-07 14:17:03 +00:00
TreeHugger Robot
8b53f6ba7f
Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370
Change-Id: Idb404c80fe9d7dcaaf488f4ea0c114e79a8b7dd8
2021-06-07 13:57:34 +00:00
TreeHugger Robot
74eb92ea6f
Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370
Change-Id: Ic6b224330480d9da7aae61d69b0720fe9bf15f65
2021-06-07 13:55:22 +00:00
TreeHugger Robot
5484fd3060
Merge "Revert DND toggle back to a button" into sc-dev
2021-06-07 13:40:54 +00:00
Yanting Yang
daff4fc200
Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52
am: 1fcebc0c64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059
Change-Id: I6eadddd6ac0da6e34e027b8a81589bfe5c30fd77
2021-06-07 11:22:52 +00:00
Yanting Yang
72c2d420f9
Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52
am: dc1d8749f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059
Change-Id: I1237bacc724810d73361574bd0e480764bb2009a
2021-06-07 11:21:54 +00:00
Yanting Yang
dc1d8749f3
Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059
Change-Id: I1a0437437910ed1dbde650cdb339c302ff600a42
2021-06-07 11:08:21 +00:00
Yanting Yang
1fcebc0c64
Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059
Change-Id: Ifc08e310a1fdec0f443e368082c46f66c1b779c2
2021-06-07 11:04:39 +00:00
Yanting Yang
8b3f0e8d52
Merge "Update homepage summaries" into sc-dev
2021-06-07 10:55:08 +00:00
TreeHugger Robot
70e2da8fa7
Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b
am: 267c7eb473
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870
Change-Id: Ie3883861b841671436a4a7d986aaa56b68d0a41c
2021-06-07 09:18:02 +00:00
TreeHugger Robot
e086913411
Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b
am: f1c4b2581c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870
Change-Id: Iad3bd02080f0cdd33050e7d0a6ca0d1a4bf2adcb
2021-06-07 09:17:04 +00:00
TreeHugger Robot
f1c4b2581c
Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870
Change-Id: If5533faccc4e1fb26b112434e7cad8caa698071d
2021-06-07 09:03:42 +00:00
TreeHugger Robot
267c7eb473
Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870
Change-Id: I8b0c5bc5132c84ab5c21b0490ea86f9dffbce35e
2021-06-07 09:02:08 +00:00
TreeHugger Robot
d29e28ed5b
Merge "Rename Wi-Fi switch controller's key" into sc-dev
2021-06-07 08:48:37 +00:00
Stanley Wang
8802f8487f
Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c
am: 13fe2c79f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882
Change-Id: I19a12ed21a771bc0264600e383ac341a4d2d9a13
2021-06-07 08:20:38 +00:00
Stanley Wang
ab629099ed
Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c
am: d19ad8e565
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882
Change-Id: I5b99eced55bc34b20fbe32d8bec158ea7e44a8bf
2021-06-07 08:19:46 +00:00
TreeHugger Robot
32f59d1243
Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32
am: b9041286aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827
Change-Id: I3d13e095fd5c5df152f7b6957efd8910ae14d2fe
2021-06-07 08:19:41 +00:00
Stanley Wang
13fe2c79f3
Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882
Change-Id: Idfe8951bace3d2b1f244f283f7eb4a78b7726ccc
2021-06-07 08:16:47 +00:00
TreeHugger Robot
a5652f4df8
Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32
am: 8c3f175a04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827
Change-Id: I2fb598b58ea4a1e7b172103c535feabe4dffc9f5
2021-06-07 08:14:23 +00:00
Stanley Wang
d19ad8e565
Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882
Change-Id: I4873e2b15c26b9348c43cfaa383d8e62fb5b35bc
2021-06-07 08:08:00 +00:00
Stanley Wang
1d60ddea0c
Merge "Update the Bubbles page." into sc-dev
2021-06-07 08:04:03 +00:00
TreeHugger Robot
b9041286aa
Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827
Change-Id: I63c367f653a1c85a238cd8d1fd442bb460eb2f7e
2021-06-07 08:01:42 +00:00
TreeHugger Robot
8c3f175a04
Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827
Change-Id: I29ee837a1674349c1db05f254808879572d84521
2021-06-07 07:57:52 +00:00
TreeHugger Robot
8fdc0b9d32
Merge "Increase the maximum height of panel fragment" into sc-dev
2021-06-07 07:38:45 +00:00
TreeHugger Robot
25ebfd2e76
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e605b8d705
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14876241
Change-Id: I791c0d6c726bafc5b6856dbaa8d442016330ac57
2021-06-07 07:22:29 +00:00
Jason Chiu
fe01ecc052
Rename Wi-Fi switch controller's key
...
Leverage the key of WifiPrimarySwitchPreferenceController for Settings
Search mapping it to the slice
Bug: 186181785
Test: manual, robotest
Change-Id: I1372afff93f01505c377e94b648e6f8dcbbafe54
2021-06-07 15:08:59 +08:00
TreeHugger Robot
e605b8d705
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-07 06:58:25 +00:00
TreeHugger Robot
ba63dd96ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ffe95b65ac
-s ours am: a9db8202d9
-s ours am: 15c2908341
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875936
Change-Id: Iec38effb6f6b2831509727ba37ab87fafe9e0a45
2021-06-07 05:41:12 +00:00
Bill Yi
a11ddf9b59
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 509a162ad5
-s ours am: a9a64b88e1
-s ours am: 414f5a5bc2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875938
Change-Id: Iea48fe1c8d209271d30263b0846d149508dac0d3
2021-06-07 05:41:05 +00:00
TreeHugger Robot
645347c6af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 020cfbe13a
-s ours am: 01b5d0f9cf
-s ours am: 6234cb9bb0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875946
Change-Id: I87a7b00df3f7d62be8bcde12bda8224d52ca0ded
2021-06-07 05:40:55 +00:00
Bill Yi
78e83b968b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb3b29aa23
-s ours am: 7631c9584f
-s ours am: fa04d42538
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14876234
Change-Id: Ic25e8709f487fd43851845b3b07d50723a0dd63d
2021-06-07 05:40:41 +00:00
TreeHugger Robot
91f66fb46b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ffe95b65ac
-s ours am: a9db8202d9
-s ours am: f127ff7be0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875936
Change-Id: Ied7a377f1be6693cf362b74a9a7d05498c323dcb
2021-06-07 05:32:50 +00:00
Bill Yi
e9baff159d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 509a162ad5
-s ours am: a9a64b88e1
-s ours am: c1baa56445
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875938
Change-Id: I4c65ef7540cffd9c1b044b7d0f937ec248eaa879
2021-06-07 05:32:42 +00:00
TreeHugger Robot
9f99a894b0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 020cfbe13a
-s ours am: 01b5d0f9cf
-s ours am: 64f45aff8e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875946
Change-Id: I1c3475f0f2d6c91bf22c4e91dd11da9074ef5cc8
2021-06-07 05:32:34 +00:00
TreeHugger Robot
f127ff7be0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ffe95b65ac
-s ours am: a9db8202d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875936
Change-Id: I0da5b4402095b9b48c648527c5bc44e4b1f19063
2021-06-07 05:27:59 +00:00
Bill Yi
c1baa56445
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 509a162ad5
-s ours am: a9a64b88e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875938
Change-Id: I656fb0d040d00a8ea03bf918b6ee7e4395ee0930
2021-06-07 05:27:52 +00:00
TreeHugger Robot
64f45aff8e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 020cfbe13a
-s ours am: 01b5d0f9cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875946
Change-Id: I52dd881854e565fb60c7d0d369a171d6e1525f54
2021-06-07 05:27:30 +00:00
Bill Yi
976cf43ca2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb3b29aa23
-s ours am: 7631c9584f
-s ours am: f1236b1743
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14876234
Change-Id: Ieb2d75e2dd61e703fb412430100ea3d27405dc83
2021-06-07 05:27:23 +00:00
Bill Yi
f1236b1743
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb3b29aa23
-s ours am: 7631c9584f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14876234
Change-Id: I47dede8fa3b1b05facb38bffe5ecb5d40997dafa
2021-06-07 05:27:18 +00:00
TreeHugger Robot
ecb5656193
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 17c5234bca
-s ours am: 7663ae6f6b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14876236
Change-Id: Ibefe0c269b035e8aa55e34db5d467007aa410242
2021-06-07 05:27:15 +00:00
TreeHugger Robot
405ea373f2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0f95249651
-s ours am: 946f0b1fe4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14876239
Change-Id: If559154688352987e5a3f4ce7eed7ad5f6787c30
2021-06-07 05:26:35 +00:00
TreeHugger Robot
15c2908341
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ffe95b65ac
-s ours am: a9db8202d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875936
Change-Id: Idebfcfaae1f45709d6b855024a355bff18670ba0
2021-06-07 05:26:31 +00:00
Bill Yi
414f5a5bc2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 509a162ad5
-s ours am: a9a64b88e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875938
Change-Id: I1659ab807e61c0e7bef294edfe1d9ab6b62f13af
2021-06-07 05:26:22 +00:00
TreeHugger Robot
6234cb9bb0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 020cfbe13a
-s ours am: 01b5d0f9cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14875946
Change-Id: I0e9cfd07cc8558d58c53c1a8f2343b3606e0ff49
2021-06-07 05:26:18 +00:00
Bill Yi
fa04d42538
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb3b29aa23
-s ours am: 7631c9584f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14876234
Change-Id: I9f2a30c74f74d018bd98c6497a39bddacdfd43ac
2021-06-07 05:25:59 +00:00