Commit Graph

88158 Commits

Author SHA1 Message Date
Abel Tesfaye
26c9a050da Merge "Fix for Smart auto rotate text summary not updating after QS toggle is modified" into sc-dev am: c89b3afef5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14830095

Change-Id: I3a90e04d82ce0c22677c18d6e5a85620b9b910a9
2021-06-07 17:25:31 +00:00
Abel Tesfaye
443e1b4beb Merge "Fix for Smart auto rotate text summary not updating after QS toggle is modified" into sc-dev am: c89b3afef5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14830095

Change-Id: Ibf6b611b7fa4b1a0a75c985b90a5f375fb1fc6c6
2021-06-07 17:25:20 +00:00
Abel Tesfaye
c89b3afef5 Merge "Fix for Smart auto rotate text summary not updating after QS toggle is modified" into sc-dev 2021-06-07 17:11:13 +00:00
Julia Reynolds
bbdf7e6d04 Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634 am: 68b08c590f am: 43a744334c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: I87455adfa2c9936bc5699de8d854accd8d3a7b9a
2021-06-07 15:50:53 +00:00
Julia Reynolds
899f301442 Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634 am: 77d3f2ec14 am: 78dcb67cf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: I8dd8485f757d148cdc27b6bebc0db622c0091056
2021-06-07 15:49:24 +00:00
Julia Reynolds
43a744334c Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634 am: 68b08c590f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: Ie2aa2684a1a11fca1d9c1e812ea71cbc759ee875
2021-06-07 15:23:56 +00:00
Julia Reynolds
fd8aa833cf Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634 am: b03f1946c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: Ieaec6e4e30244a9ab4611b8c738d502d2218bca4
2021-06-07 15:22:15 +00:00
Julia Reynolds
78dcb67cf3 Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634 am: 77d3f2ec14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: I57c6941b13c205dded9566cb542d07da853c55dd
2021-06-07 15:22:14 +00:00
Julia Reynolds
77d3f2ec14 Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: Ib87eda47612717576f48fb96530b3ae627b94f95
2021-06-07 15:09:40 +00:00
Julia Reynolds
68b08c590f Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: Icf9f2f46688689962e93f7063160e5beddbfbdd2
2021-06-07 15:08:17 +00:00
Julia Reynolds
b03f1946c1 Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: Icf370ce52002a252644003bcfbdbc45b7fa248c5
2021-06-07 15:08:17 +00:00
Matt Casey
c7f90798aa Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1 am: 45ea44c464 am: 7604720b10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842

Change-Id: I23701eaf91c6a5d6dad8369237fb4ec64c738eb4
2021-06-07 15:01:42 +00:00
Matt Casey
d90c2eddf5 Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1 am: 83ab0dea1d am: 7e73280edf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842

Change-Id: Ia25c6c4c8b92c6895f2722e25b672bc777fafe14
2021-06-07 15:01:35 +00:00
Julia Reynolds
6d6280c634 Merge changes I31066a6f,I081cea0d into sc-dev
* changes:
  Fix broken test
  Updates to conversation page
2021-06-07 14:50:00 +00:00
Matt Casey
7604720b10 Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1 am: 45ea44c464
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842

Change-Id: I5a46a03ca44992a5a19d3960d56fe7d228ac94ac
2021-06-07 14:48:41 +00:00
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
d476ffd3de Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1 am: 5e6d42bf1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842

Change-Id: Iddad11b138f58708d1b3927feb1c6c3b9a67558a
2021-06-07 14:47:15 +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
9df8575ef7 Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060 am: 74eb92ea6f am: 203ab249ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370

Change-Id: I5f0c169d43818ad2f7d75bdbfd1ea7ec1f768ed9
2021-06-07 14:32:11 +00:00
TreeHugger Robot
993702b988 Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060 am: 8b53f6ba7f am: 5194e04d3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370

Change-Id: Ic415146bf3e6764b8471207d8b82719f66ee7425
2021-06-07 14:31:46 +00:00
Matt Casey
5e6d42bf1e 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: I7cda59b4e5fb02d850c735a2ebf86daf320ac8b7
2021-06-07 14:31:36 +00:00
Matt Casey
45ea44c464 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: I30946a38d48603f756438096ac9a7de4418d0a0b
2021-06-07 14:29:28 +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
4d45474cc9 Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060 am: 326d9d2129
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370

Change-Id: Idc82b6b47ee782dd5462198edc3a04861f0fa9a0
2021-06-07 14:16:34 +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
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
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