Commit Graph

67360 Commits

Author SHA1 Message Date
Victor Chang
b07e53c1c8 Move libcore.timezone to the i18n module - Final part
Bug: 141747409
Test: atest CtsLibcoreTestCases  CtsLibcoreTestCases
Change-Id: I48a1f383403a553639f525ef92996292fab84c5e
2020-06-30 14:35:09 +01:00
Stanley Wang
ca05c7fabd Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I132e88d5b1cb22db5042c0e66b6bc61ab30efcba
2020-06-30 10:41:41 +00:00
Stanley Wang
e86dd271da Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev 2020-06-30 10:28:33 +00:00
Stanley Wang
db0687c447 Remove the prefix "Model:" from the summary of hardware.
Fixes: 159529327
Test: run robotest and observe the UI
Change-Id: I60f4a341b427e4b619a202a440f3f2554c562a27
2020-06-30 16:45:47 +08:00
android-build-team Robot
f43b8f99eb Snap for 6640159 from 5ff637fb1c to mainline-release
Change-Id: I0ace46f8f5875951aefe5a9886946d3f4b58cacc
2020-06-30 03:09:43 +00:00
Joshua Duong
ac7e62af8d Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: ba1e9c30c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: Id96ff4092b01f68de14c859461e2cf82717694c8
2020-06-30 02:08:09 +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
5ff637fb1c 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: Ia093e4bf25f3cb00ac56e422c1e116899f96e0f2
2020-06-30 01:52:23 +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
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
8071001ecc 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: I56f45a5b566bb615b2a31772e6db169c656b8dc6
2020-06-29 18:48:43 +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
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
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
d4bef905da [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: Ief8836f5bf05a8a9bce22964ad2dbf8bf7fefdbf
2020-06-29 07:44:07 +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
71e8ad086d 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: If748158226e436f716e1f651708fcca9486e62a4
2020-06-29 04:41:05 +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
android-build-team Robot
2cc9f94335 Snap for 6637022 from 38e17576b4 to mainline-release
Change-Id: I548ddd3f494f3db1aea7f5bbb8d268e541c6c954
2020-06-29 03:10:08 +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
38e17576b4 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: I821372c068dc687039401c3d7dc31d8febc8d977
2020-06-29 01:53:53 +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