Commit Graph

74955 Commits

Author SHA1 Message Date
Lucas Dupin
1530c46690 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: Ie05cfa7cc0897e370c3ced865dceee0745b5533c
2020-06-29 18:48:39 +00:00
Lucas Dupin
51aacb7752 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I369b03f9371b0b8063f9f63b94f83b9b18555f4a
2020-06-29 18:48:17 +00:00
Lucas Dupin
837bda1f25 Merge "Change the order of dark theme options to match night light" into rvc-dev 2020-06-29 18:35:12 +00:00
Minche Li
45de9111fc Merge "Supports triple-tap shortcut for window magnification" am: 08e2fec40d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908538

Change-Id: I1519c6df733daf0ba3abc4027d375ded3b28b5b4
2020-06-29 17:17:34 +00:00
Minche Li
08e2fec40d Merge "Supports triple-tap shortcut for window magnification" 2020-06-29 17:05:02 +00:00
Treehugger Robot
d4889a234f Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755 am: d1051792b1 am: c5278b7610 am: 49954a28b7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Idae50b55487e8d50c3dd2428d94a05b20512b5e8
2020-06-29 15:42:09 +00:00
Treehugger Robot
49954a28b7 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755 am: d1051792b1 am: c5278b7610
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: I97b1e64a713fddd5325c716ee758c58ade66c593
2020-06-29 15:27:58 +00:00
Treehugger Robot
c5278b7610 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755 am: d1051792b1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Id472f21203bb4dfe3e460db74c68e1b523a52ab4
2020-06-29 15:16:01 +00:00
Treehugger Robot
d1051792b1 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Ia665650c897801e914d9c580e4f2f59e9fe2ec28
2020-06-29 15:01:17 +00:00
Treehugger Robot
3947998755 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: I5fc5d8b00e9b6e0c28389754cd4cf7eeb9bdc969
2020-06-29 14:39:26 +00:00
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
a490eef6f9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: d22c1f1552 -s ours am: d49caa29b9 -s ours am: 2fd313701a -s ours am: 90d44a54e4 -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: Ia7a2ea9a37d832c328ba759ca676506b7a2bed62
2020-06-29 09:32:32 +00:00
TreeHugger Robot
c4e834302a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: ee707c052b -s ours am: a7247b35ae -s ours am: ab5652e67f -s ours am: 909da0de5a -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: I63815e19298cd7e0383740d5f872aee229f02f6c
2020-06-29 09:31:55 +00:00
TreeHugger Robot
e8b227af49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: ee707c052b -s ours am: d36f9bb780 -s ours am: 4cfc99dc49 -s ours am: 3e34824a47 -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: I6f5773e0c69225a0353a8fa4a87698425ec38003
2020-06-29 09:31:36 +00:00
TreeHugger Robot
90d44a54e4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: d22c1f1552 -s ours am: d49caa29b9 -s ours am: 2fd313701a -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: I70005511920de549d6956bf06e9775045cc9fe66
2020-06-29 09:17:38 +00:00
TreeHugger Robot
909da0de5a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: ee707c052b -s ours am: a7247b35ae -s ours am: ab5652e67f -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: I710e7fd0620ab94f28607cc1af98b2fee325e66e
2020-06-29 09:17:09 +00:00
TreeHugger Robot
3e34824a47 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: ee707c052b -s ours am: d36f9bb780 -s ours am: 4cfc99dc49 -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: Idb325e237642d8b876ec6e35c84a1593df2269b4
2020-06-29 09:16:40 +00:00
TreeHugger Robot
2fd313701a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: d22c1f1552 -s ours am: d49caa29b9 -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: Ice7aea2513d11ff5bacd75a3ae1e0fcfb1fa3cb1
2020-06-29 09:08:04 +00:00
TreeHugger Robot
ab5652e67f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: ee707c052b -s ours am: a7247b35ae -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: I7cfde1cb91dd7340dc7a1b8c0002b5e15f9dfc6e
2020-06-29 09:06:41 +00:00
TreeHugger Robot
4cfc99dc49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: ee707c052b -s ours am: d36f9bb780 -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: I7b97d78ab60b89d2d64474a54eb01fa61ae3e164
2020-06-29 09:06:28 +00:00
TreeHugger Robot
d36f9bb780 [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: I19d47f8f199d80add9ab33f9b3c01fbb913bbcdf
2020-06-29 08:07:00 +00: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
TreeHugger Robot
a059909cb8 Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358 am: 5412d4ab3e am: 6d115a5616 am: 7bfa0750c4 am: e5c0ebc7d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: I3ae5791bb76ecf4d863312d44b77009cfd5413d8
2020-06-29 05:38:54 +00:00
TreeHugger Robot
27c5e87594 Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358 am: c667ed0244 am: d0a22c5728 am: 8d7b860b60 am: 98ca7eab65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

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

Change-Id: I72b4ff1c05b8380bd8eabcc7d55ec9e385ea39ae
2020-06-29 05:38:27 +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
e5c0ebc7d5 Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358 am: 5412d4ab3e am: 6d115a5616 am: 7bfa0750c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

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

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

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

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

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

Change-Id: I72473401190ccedffd3fee36d4d0935642996a26
2020-06-29 05:05:22 +00:00
TreeHugger Robot
6d115a5616 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: I643205b23faf47bcc39025eeda74bfd67ca09d8b
2020-06-29 04:52:52 +00: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
9f29a569f9 Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6 am: 8793b373be am: 4c61922769 am: f3ac7b13a7 am: 5a44b59575
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

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

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

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

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

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

Change-Id: I1aa01edb029a24dce6a8b0df6d41ea720c11831f
2020-06-29 02:32:29 +00:00