Commit Graph

65187 Commits

Author SHA1 Message Date
TreeHugger Robot
1ae0eb1cf4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 5aca5b752c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I593a13e9af4a9057437b600849fd42ce2681c14c
2020-07-06 00:25:54 +00:00
TreeHugger Robot
8165edfbe4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic57e1314c68bdcd48c597b17392fdadc20f68f81
2020-07-06 00:25:36 +00:00
TreeHugger Robot
609664b8c4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04ee9c383b853e21da8e0fe93b2fabde40aab270
2020-07-06 00:16:45 +00:00
TreeHugger Robot
5aca5b752c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb18c6816cc05929ee7092ee686aa5e19785cc53
2020-07-06 00:16:40 +00:00
TreeHugger Robot
32cca3cb83 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ccbbb5c5c2de481e72808820b1035d35a0bf1f3
2020-07-06 00:04:51 +00:00
TreeHugger Robot
f2528db4de Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-07-05 23:43:58 +00:00
Bill Yi
1457e7205f [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 50d226b634 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0cb1de1ed1868a680881a32ac779bfb2099e212a
2020-07-05 21:12:41 +00:00
Bill Yi
c7652b63a2 [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours am: 538f3b464d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17b4f97775eae5da1f81c044e2058d885ba2b5e0
2020-07-05 21:12:11 +00:00
Bill Yi
50d226b634 [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03a1fd779f295328c6b19ee9205af23126ad775d
2020-07-05 21:00:09 +00:00
Bill Yi
538f3b464d [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa250ce1df5528bfae99aed308832a91d17cc0bf
2020-07-05 20:59:38 +00:00
Bill Yi
94d87aa5f4 [automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e259f31598ec919754135ea245d023b443b9446
2020-07-05 20:50:14 +00:00
Bill Yi
6507b1e828 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ic9dae74f8978425037e22523d26fc96e77a24289
2020-07-05 13:10:30 -07:00
Bill Yi
435bee70ea Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I83c60d95313ae0a41616573648a163ae31a8145d
2020-07-05 12:34:41 -07:00
Bill Yi
9b1cc94f96 [automerger skipped] Import translations. DO NOT MERGE am: 2a483616ec -s ours am: 00807a5a23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8b7ac2482425017d78bd1c2a20a7d2d3aa619e4a
2020-07-04 05:24:10 +00:00
Bill Yi
be952602a8 [automerger skipped] Import translations. DO NOT MERGE am: 2a483616ec -s ours am: 1e52695e08 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43508ac7a0ee74090c91ee463175cd0b9755e06f
2020-07-04 05:18:34 +00:00
TreeHugger Robot
1685b5971d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 62c51e7c90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85b7520b32f970f1a025e2873cbc98fe7273b483
2020-07-04 05:18:25 +00:00
Bill Yi
00807a5a23 [automerger skipped] Import translations. DO NOT MERGE am: 2a483616ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4bd1f995dba24a4cdd02e2945badcd00d06b72a
2020-07-04 05:11:11 +00:00
Bill Yi
1e52695e08 [automerger skipped] Import translations. DO NOT MERGE am: 2a483616ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbf53f875f5167d6786ebb384b27b1651728906f
2020-07-04 05:11:07 +00:00
TreeHugger Robot
62c51e7c90 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-07-04 05:08:19 +00:00
Bill Yi
2a483616ec Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I366c375aa973a601c98395d6052e1bcb42b69e8c
2020-07-03 19:09:34 -07:00
Bill Yi
798645bcd7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: If4cd3e4c612e4bf5dc91149a875f035225781b75
2020-07-03 17:41:33 -07:00
Bill Yi
9b3ab482ae [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 273e88795b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifdd036af8578c1944d69488a8adb5f9fac85cdd8
2020-07-03 17:48:23 +00:00
TreeHugger Robot
f5575f3b6e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1ba8b63d47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If28ae3e650498f3e8a0b019a1ae630e37b98e80c
2020-07-03 17:41:18 +00:00
TreeHugger Robot
1ba8b63d47 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-07-03 17:37:11 +00:00
Bill Yi
7a001355d9 [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 83a61a3847 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14f13f6e6a93813a713d2a5a92bf51126c21f485
2020-07-03 17:35:14 +00:00
Bill Yi
d06318315e [automerger skipped] Import translations. DO NOT MERGE am: 8f48b24724 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f095f2c2b75147c7eb33da40f07a824d692781c
2020-07-03 17:35:07 +00:00
Bill Yi
273e88795b [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d632bc674b89510499b86a30ed241111cad688e
2020-07-03 17:28:03 +00:00
Bill Yi
83a61a3847 [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3dacc8f8b8eebc5a9a9d0ae89b0f3eaa7241147b
2020-07-03 17:27:45 +00:00
Bill Yi
4b3114ef6c Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ieee3da442eb6247624bef2be98e29d883d6ea48f
2020-07-03 09:09:54 -07:00
Bill Yi
8f48b24724 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ie018441281959e022f38de2f704cf2f3f697de06
2020-07-03 08:39:13 -07:00
Bill Yi
9dcae7e510 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I3a787cd8d7e3b2900c18e6e53ab9e3f92ea4430a
2020-07-03 07:05:39 -07:00
vichang
56a24f9ac1 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53 am: bc7f639e15
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: I8d99d5ce1a84db343dac195a38c47041b7bf66f3
2020-07-02 11:03:47 +00:00
vichang
bc7f639e15 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: I8e81b3d707bce016006bf0af1f75785ecd15648e
2020-07-02 10:50:06 +00:00
vichang
7485036f53 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: I745cd8bb0dc761d269e804ee871b249a157c4b6a
2020-07-02 10:38:54 +00:00
vichang
268371c44e Merge "Move libcore.timezone to the i18n module - Final part" 2020-07-02 10:25:54 +00:00
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
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
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
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