Commit Graph

69916 Commits

Author SHA1 Message Date
Joshua Duong
3de3fa1f78 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I0e614ceae85cc87efc4e26a4d8a277b52b582fb6
2020-06-30 02:07:54 +00:00
Joshua Duong
8917715fca Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I8f07e53a674a9494a7148dcee9e9bf45db097330
2020-06-30 02:07:53 +00:00
Joshua Duong
ba1e9c30c4 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: Id03f133b8480af4f1febe9cbf7b9024896ba67b1
2020-06-30 01:52:18 +00:00
Joshua Duong
d6b68cb328 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: Ic5de5436b1386028a26f121d8d857d27e7aebece
2020-06-30 01:51:47 +00:00
Joshua Duong
8776749e88 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev 2020-06-30 01:41:14 +00:00
Lucas Dupin
2fd9c7af96 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 51aacb7752 am: 88a47d6bda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

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

Change-Id: I30c7cf15a5fc024539e87156dd410412c85ab7d9
2020-06-29 19:15:01 +00:00
Lucas Dupin
786a6dec8d Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 1530c46690 am: e030668d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

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

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

Change-Id: I402237ce71cf2084085d1375380c4aada6d8aa1a
2020-06-29 19:02:19 +00:00
Lucas Dupin
e030668d6b Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 1530c46690
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I21875f9bac17a782d238f7515d9e84b36db15144
2020-06-29 19:01:03 +00:00
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
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
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
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
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
f3ac7b13a7 Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6 am: 8793b373be am: 4c61922769
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

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

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

Change-Id: Ie6fa4edeb9df9eddb040c86e46214615fb05428c
2020-06-29 02:20:23 +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
4c61922769 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: I97a85d4c507155a5c1630983c329d91efb2b44c3
2020-06-29 02:06:04 +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
8867b20fe0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f9017e5ad0 -s ours am: ca18049f2b -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: I1b516cf4be92d51d36c8252c23f2069784ff44d8
2020-06-27 18:32:59 +00:00
TreeHugger Robot
79110c726b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 81af0c07a6 -s ours am: b415bab2bc -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: Ie5a16b0c1c3adda06e8046905254f5f45b271f88
2020-06-27 18:32:18 +00:00