Commit Graph

65673 Commits

Author SHA1 Message Date
Treehugger Robot
fce601ea2a Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Ia62597a163e529ef20e4136645709b0d300a4fc4
2020-06-29 14:28:03 +00:00
Treehugger Robot
b1cea4f1bc Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" 2020-06-29 14:14:47 +00:00
LuK1337
ad243904db Settings: Fix fallback summary for power_button_instantly_locks preference
* Using summary_placeholder instead of summary_empty
  leaves an ugly empty space.

Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89
2020-06-29 12:27:06 +02:00
TreeHugger Robot
d49caa29b9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: d22c1f1552 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12027836

Change-Id: Icbfefdb011b7c902f9caf2d4f16524808c3a6dcf
2020-06-29 08:06:44 +00:00
TreeHugger Robot
a7247b35ae [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: ee707c052b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12027836

Change-Id: I5f6ac0dc0ffe4003871a545a3167bcf843d8df08
2020-06-29 08:06:30 +00:00
TreeHugger Robot
ee707c052b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12027836

Change-Id: I7014817fc560b7fd7dd4aa59285f92935961e764
2020-06-29 07:44:09 +00:00
TreeHugger Robot
d22c1f1552 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12027836

Change-Id: I3ef548599161e7a100dc6fdacc70ca877375e83c
2020-06-29 07:44:07 +00:00
TreeHugger Robot
f002dd72ac Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-29 07:24:13 +00:00
Bill Yi
45092142eb Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ibfe2b145e92201622fda1d57bae726dd5d4e4eab
2020-06-28 22:35:46 -07:00
TreeHugger Robot
d0a22c5728 Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358 am: c667ed0244
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: Ic04a895956861eb6e3b2679c0a389fe34ab91c8b
2020-06-29 04:52:51 +00:00
TreeHugger Robot
e7cb1080aa Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358 am: 5412d4ab3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: I14a35d865b8ea449ebf4d410f4bf205e5a40767d
2020-06-29 04:52:29 +00:00
TreeHugger Robot
c667ed0244 Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: I576d18617e5b5860017d102df90d569f0e056c06
2020-06-29 04:40:54 +00:00
TreeHugger Robot
5412d4ab3e Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: Id1444c234fb4a0b238fafc02a5f24f880e32d8c4
2020-06-29 04:40:39 +00:00
TreeHugger Robot
531dbf5358 Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev 2020-06-29 04:28:20 +00:00
Bonian Chen
a2c352fc81 Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6 am: 6e8f6d840a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

Change-Id: Ib9b8951264923d39cf2bf871dc73be7293fbdd70
2020-06-29 02:06:05 +00:00
Bonian Chen
14a6d13916 Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6 am: 8793b373be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

Change-Id: Ic8100d80a87dbc9160e6f0cd0d2d0da4648c1b86
2020-06-29 02:05:26 +00:00
Bonian Chen
6e8f6d840a Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

Change-Id: I7af555ea420dc289052553706931fbfea55edf45
2020-06-29 01:53:51 +00:00
Bonian Chen
8793b373be Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

Change-Id: I226e7c7d6ad569d74acec3e306e7745c67056752
2020-06-29 01:53:30 +00:00
Bonian Chen
136cb73ae6 Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev 2020-06-29 01:42:26 +00:00
TreeHugger Robot
16b4c9de4a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f9017e5ad0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12014459

Change-Id: Ie87473d7666e8123f3dd28290ec29dcfa4bb8fe0
2020-06-27 18:31:23 +00:00
TreeHugger Robot
f9017e5ad0 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-27 18:14:35 +00:00
TreeHugger Robot
5a7728ad79 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 81af0c07a6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12020669

Change-Id: Id06ba9647b11cd11527262c84557fcf3ad929731
2020-06-27 18:09:06 +00:00
TreeHugger Robot
81af0c07a6 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-27 17:54:06 +00:00
Bill Yi
54e5f583c5 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ie8a0cbb1ff097337976dab1e800b2cefbdf3660f
2020-06-27 06:05:21 -07:00
Bill Yi
b65b25728d Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ifff0798b596eb2dcd04a037c8acebe60e1849317
2020-06-27 05:33:40 -07:00
TreeHugger Robot
8f04d7349b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af5950790a -s ours am: 0a854d7625 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12011186

Change-Id: I5c49b9e654665d87c821e42b32cc0e616e954478
2020-06-27 05:20:57 +00:00
TreeHugger Robot
b776be6c0b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af5950790a -s ours am: 4624cf1eef -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12011186

Change-Id: Ia77c76651e38dc7648f81fb9225a0fa507fda49b
2020-06-27 05:20:33 +00:00
TreeHugger Robot
0a854d7625 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af5950790a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12011186

Change-Id: Iad9cba32d171f6109ef09f9d100c987cffcd7c48
2020-06-27 05:00:42 +00:00
TreeHugger Robot
4624cf1eef [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af5950790a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12011186

Change-Id: I9395a9c074699ec0c212db65fd6a98b5243f0c0a
2020-06-27 05:00:19 +00:00
TreeHugger Robot
af5950790a Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-27 04:47:27 +00:00
Daniel Sandler
63012b1c2d Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341 am: efa762ee38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: Id303924ef226e19c5ef142f5f2cb5bc2565b7783
2020-06-26 21:53:03 +00:00
Daniel Sandler
bfd11a8930 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341 am: 75e505cc88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: Ic8c299f34fc9d7ba7c8e77065d027c3f896f8f4a
2020-06-26 21:52:38 +00:00
Daniel Sandler
efa762ee38 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: I9badb63c20a466ead612cc0e0a679015007a1a00
2020-06-26 21:39:05 +00:00
Daniel Sandler
75e505cc88 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: I159e8a7c412967b5ac9c063ecd01d4554ec90d4f
2020-06-26 21:38:56 +00:00
Daniel Sandler
5d625e2341 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev 2020-06-26 21:22:26 +00:00
Jakub Pawlowski
9f208428ac [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours am: a8eb503247 -s ours am: 2696b1a583 -s ours am: 29f56be69a -s ours am: a072267162 -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 ba7f6d7d45 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11986974

Change-Id: I0e32f71017ed2e2d1b68e42bd39af9aa0cb6726a
2020-06-26 21:21:26 +00:00
Jakub Pawlowski
d9cb967bf7 [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours am: a8eb503247 -s ours am: 2696b1a583 -s ours am: 29f56be69a -s ours am: 62b800d13b -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11986974

Change-Id: I151a5236b4e5eae1643824093bcb1362a141fca5
2020-06-26 21:20:42 +00:00
Jakub Pawlowski
62b800d13b [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours am: a8eb503247 -s ours am: 2696b1a583 -s ours am: 29f56be69a -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11986974

Change-Id: I3afc044fa8f1fbf7ea1923fa58d648d39004e687
2020-06-26 21:08:42 +00:00
Jakub Pawlowski
a072267162 [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours am: a8eb503247 -s ours am: 2696b1a583 -s ours am: 29f56be69a -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11986974

Change-Id: I3dc7a523a612c96edba07636c5e064beeafcab9d
2020-06-26 21:08:33 +00:00
Jakub Pawlowski
29f56be69a [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours am: a8eb503247 -s ours am: 2696b1a583 -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11986974

Change-Id: I30588a9209378a5b25667ac5a75ecfdaa8803365
2020-06-26 20:56:05 +00:00
Bill Yi
9055425240 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Icf83136caadca9065b4e3cc03ad45ba6e8fa85f2
2020-06-26 13:47:52 -07:00
Jakub Pawlowski
2696b1a583 [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours am: a8eb503247 -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11986974

Change-Id: I643fbe7ca49ca09847806c2873f249d9e2eb892e
2020-06-26 20:44:35 +00:00
Jakub Pawlowski
a8eb503247 [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11986974

Change-Id: Ibae39d4d4f5962e682648e007dd376831574d61c
2020-06-26 20:28:27 +00:00
Jakub Pawlowski
c49fcef907 Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11986974

Change-Id: Ice5a98b7d2c10e9ee62ed20da7aa9213d18a4d8b
2020-06-26 20:06:25 +00:00
TreeHugger Robot
737ae9aa08 Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0 am: 263de56a8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12003874

Change-Id: I669ffb187c46460e7010372a0eb115899dc1318f
2020-06-26 17:09:10 +00:00
TreeHugger Robot
f6c9709fb4 Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0 am: 753eb655d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12003874

Change-Id: I86274d87c917d181639d90d9bb20f3994218fd0e
2020-06-26 17:08:15 +00:00
TreeHugger Robot
263de56a8d Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12003874

Change-Id: I9d9c01e7ff707dd2024f8d880fdeed7dcea17faa
2020-06-26 16:54:26 +00:00
TreeHugger Robot
753eb655d1 Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12003874

Change-Id: Ibc086b620e35319115d8101f064143d7069c4598
2020-06-26 16:54:22 +00:00
TreeHugger Robot
15a62defd0 Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev 2020-06-26 16:41:52 +00:00
TreeHugger Robot
b753b984f6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0743064846 -s ours am: 63cfc7a392 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12008580

Change-Id: I5f6a9789acf451f534c00081784134a3d9978bb7
2020-06-26 16:36:02 +00:00