Commit Graph

88435 Commits

Author SHA1 Message Date
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
326d9d2129 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: I5bfbbcf1c6567468b2bcd6aa87810b8de558f668
2021-06-07 13:56:02 +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
16a8249538 Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52 am: 1fcebc0c64 am: daff4fc200
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059

Change-Id: Ib714113327f4554183e1ad0e859f7c063dc27e3b
2021-06-07 11:35:45 +00:00
Yanting Yang
91df29ff68 Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52 am: dc1d8749f3 am: 72c2d420f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059

Change-Id: I043ffd6ef2828b7e2efbc53370c838dfc043a58e
2021-06-07 11:35:36 +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
154e9a0b31 Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52 am: 8cb77c6609
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059

Change-Id: I513c48904601cb376de0ee50277a21a0c452821b
2021-06-07 11:21:28 +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
8cb77c6609 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: I92b4ab966f8958fdc18a3adb1e7e5b4a428b85e5
2021-06-07 11:06:48 +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
Mill Chen
101823e602 Update the theme to fix background color problem
The action bar in the some setting pages has different background colors
when the action bar is in collapsed mode. These pages are using the default
settings theme that doesn't include edge-to-edge setting. This can be
fixed by assigning SubSettings theme to this activity.

Fix: 189189879
Fix: 188110157
Test: visual verified
Change-Id: Ie8d9b4c950e6a8ab5a7e361f94b8587d854b3b70
2021-06-07 17:32:11 +08:00
TreeHugger Robot
73ecfe727c Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b am: 267c7eb473 am: 70e2da8fa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870

Change-Id: I17ec57fad236ae50d484d89f42ee2f8927f4b7b3
2021-06-07 09:30:48 +00:00
TreeHugger Robot
4051902809 Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b am: f1c4b2581c am: e086913411
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870

Change-Id: Iacf4522d8abfa7efbac50410e3f09ba8943b1ff2
2021-06-07 09:30:37 +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
ef6e2fa01a Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b am: aba2346cb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870

Change-Id: I6fca72be41d2c2e0f5528fbf2a7e47660e92ffbf
2021-06-07 09:16:37 +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
aba2346cb3 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: I1283432f102827b4e5bda55c0c89334523295f6a
2021-06-07 09:02:14 +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
f24aa56275 Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c am: a4dc97984f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: I4d89c568b58fefdd442a62a95b6c9955388352f5
2021-06-07 08:40:30 +00:00
Stanley Wang
d549c40d14 Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c am: 13fe2c79f3 am: 8802f8487f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: I395340c552e33a1e7b4fdfed34044e18a946b600
2021-06-07 08:34:06 +00:00
Stanley Wang
1318447470 Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c am: d19ad8e565 am: ab629099ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: I3f7d05cdfa0aa36552482cb10d48d9398b022874
2021-06-07 08:34:00 +00:00
TreeHugger Robot
4e228a7ccb Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32 am: b9041286aa am: 32f59d1243
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827

Change-Id: I648402b44c3e1e2bd43f08ae760e9674a7b54e34
2021-06-07 08:33:55 +00:00
TreeHugger Robot
194e9669fe Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32 am: 8c3f175a04 am: a5652f4df8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827

Change-Id: Iaca6814ef8f5a12a5156c2304c32d6b1bf854065
2021-06-07 08:33:33 +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
a4dc97984f 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: Ia9b3cc366fa96ee2c60880d9d529708a3fdf7337
2021-06-07 08:19:03 +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
TreeHugger Robot
e4748374d0 Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32 am: b4968ee8b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827

Change-Id: Ia0dd78b43874cc24ac92402e96baa712967f434c
2021-06-07 08:12:57 +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
b4968ee8b5 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: I435e86f2fd5aa3b60b4da0c75b5386802c50d16d
2021-06-07 08:00:10 +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
Yanting Yang
e7fbe489d1 Log class name to detect page scroll jank
Bug: 187306869
Test: robotests & take the trace and see the cuj section name

Change-Id: Idbaa62e764323f8c35c101caf2961b6c853c440f
2021-06-07 15:53:20 +08: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
1b4777f1f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e605b8d705 -s ours am: 25ebfd2e76 -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: Ifae8acace205a2af2c322ae88779c89004488c87
2021-06-07 07:37:21 +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
Wesley.CW Wang
cb40bd2947 Fix AppBatteryPreferenceControllerTest test fail
Bug: 190187197
Bug: 190239610
Test: make RunSettingsRoboTests
Change-Id: I113eb738003531c67acd72aa8f597e9c34ca2cc9
2021-06-07 14:59:13 +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
67811a55d9 [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: ba63dd96ad -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: I0aa0d90b7a57a20ccfa6b0cbdfb1a50573aec1f9
2021-06-07 05:47:53 +00:00
Bill Yi
aa191d2e23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 509a162ad5 -s ours am: a9a64b88e1 -s ours am: 414f5a5bc2 -s ours am: a11ddf9b59 -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: Ib5feaa1292dc849ee0a377499d63795c45829e4f
2021-06-07 05:47:38 +00:00
TreeHugger Robot
608d193077 [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: 645347c6af -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: I17cbffe4fbbe9bd7425044589cf813ef488c7fa3
2021-06-07 05:47:12 +00:00