PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,164 Commits 1 Branch 0 Tags
f5575f3b6e7a8e54973bb0dc73166e89dbbf20d1
Commit Graph

65164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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