Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,123 Commits 1 Branch 0 Tags
3955901146b54292bd06bd95f74e1a3a3c094e71
Commit Graph

74123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
3955901146 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1ba8b63d47 -s ours am: f5575f3b6e -s ours am: cb149ff453 -s ours am: 8bbe92595a -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: Ibe4c9d27612ba3c6ea18ea58bc6aea935a40f4c2
 2020-07-03 18:09:44 +00:00
Bill Yi
c465d8601c [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 83a61a3847 -s ours am: 7a001355d9 -s ours am: a88e0bbf56 -s ours am: de27cf623e -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: Ic108f6883567378466791504defc0c0718d1cc43
 2020-07-03 18:09:39 +00:00
Bill Yi
586768b1b5 [automerger skipped] Import translations. DO NOT MERGE am: 8f48b24724 -s ours am: d06318315e -s ours am: f92ea1613a -s ours am: 01c0e24fb4 -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: Ieaf3a9b0d18018f5f1672450eb19d7fa2ac42d94
 2020-07-03 18:09:33 +00:00
TreeHugger Robot
8bbe92595a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1ba8b63d47 -s ours am: f5575f3b6e -s ours am: cb149ff453 -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: Ic29ed0b56b08d46252d533074d7baad3fe6f793a
 2020-07-03 17:58:24 +00:00
Bill Yi
de27cf623e [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 83a61a3847 -s ours am: 7a001355d9 -s ours am: a88e0bbf56 -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: I3aeafcf345b329681c96a8d786121b9a3c908f26
 2020-07-03 17:58:14 +00:00
Bill Yi
01c0e24fb4 [automerger skipped] Import translations. DO NOT MERGE am: 8f48b24724 -s ours am: d06318315e -s ours am: f92ea1613a -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: Ie4449c774d64404f4eb48bc47a7bdc9570abaf9c
 2020-07-03 17:58:06 +00:00
TreeHugger Robot
cb149ff453 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1ba8b63d47 -s ours am: f5575f3b6e -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: I898cdad594113645e35c555052ed726f47508e8f
 2020-07-03 17:48:15 +00:00
Bill Yi
a88e0bbf56 [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 83a61a3847 -s ours am: 7a001355d9 -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: I944e9c14902134d57e5dcd1774377caab1483085
 2020-07-03 17:48:09 +00:00
Bill Yi
f92ea1613a [automerger skipped] Import translations. DO NOT MERGE am: 8f48b24724 -s ours am: d06318315e -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: Id8a2ad2e5f780a2e2190a8e85df4d49372642583
 2020-07-03 17:48:03 +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
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
56c08de8d9 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53 am: bc7f639e15 am: 56a24f9ac1 am: f233240117 am: 25c5553ef8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: Ie228af7756b24d7eee02b4b33c98217fc169bf6a
 2020-07-02 12:02:20 +00:00
vichang
25c5553ef8 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53 am: bc7f639e15 am: 56a24f9ac1 am: f233240117 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

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

Change-Id: Ib8b6ede837d8fd0b2d6c229f9bfa333050f3c892
 2020-07-02 11:21:39 +00: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
Kevin Chyn
06804ebc57 Merge "Update settings together with frameworks/base" am: 2e7fc5a0d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12053177

Change-Id: Ia4aa9f890ed345813d77e03b0c3917502fc44b99
 2020-07-02 03:15:42 +00:00
Kevin Chyn
2e7fc5a0d7 Merge "Update settings together with frameworks/base" 2020-07-02 02:57:48 +00:00
Kevin Chyn
4624a1ca5d Update settings together with frameworks/base 
Bug: 157790417

Test: SettingsRoboTests
Change-Id: Ib99d1cc2cb3196dd7231d0b78403427467a787b2
 2020-07-01 00:08:40 -07:00
Arc Wang
9678fd0f54 Merge "Fix AlertActivity child objects dark theme problem" am: 7c3bb2fc9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12041646

Change-Id: Ia1a1d23a91be4921abd7b6a9eb98723c6f79b511
 2020-07-01 01:18:20 +00:00
Arc Wang
7c3bb2fc9b Merge "Fix AlertActivity child objects dark theme problem" 2020-07-01 01:07:11 +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
4afa856688 Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da am: e9a33d48fb am: 1a5a780daa am: 4d4731474e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I37c7e64a780e94ca219a88893d6eb280b3d977e8
 2020-06-30 11:25:45 +00:00
Stanley Wang
2e4bcea886 Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da am: ca05c7fabd am: 4ff2999126 am: fdb6ff079c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: If8b92bd004f6bf9d841e19096eae8f2f6a293221
 2020-06-30 11:25:26 +00:00
Stanley Wang
4d4731474e Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da am: e9a33d48fb am: 1a5a780daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I8b62948b6585d338088cc62d97de0766a12c404f
 2020-06-30 11:10:51 +00:00
Stanley Wang
fdb6ff079c Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da am: ca05c7fabd am: 4ff2999126 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I35c7c18c370db76bd1d82f319003cb164d9b7246
 2020-06-30 11:10:44 +00:00
Stanley Wang
1a5a780daa Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da am: e9a33d48fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I50d3e9d474d87218e0ee687c5e8159e7afbaf626
 2020-06-30 10:54:04 +00:00
Stanley Wang
4ff2999126 Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da am: ca05c7fabd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I0b35dde4ac0443eaeefaa5083eeafbc0e3e1a149
 2020-06-30 10:53:47 +00: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
e9a33d48fb 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: I032839c91c8951bec8014554b7cb7de5d73d0132
 2020-06-30 10:41:39 +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
Arc Wang
5a298fbde0 Fix AlertActivity child objects dark theme problem 
In Settings, AlertActivity child objects use the theme
which is not compatible with dark theme.
Use @*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight
to fix dark theme problem.

Bug: 157961813
Test: manual visual
Change-Id: I49decbd51a4346c65c9b40dbe056687337b4b385
 2020-06-30 14:16:12 +08:00
Joshua Duong
e769d47825 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 am: 3de3fa1f78 am: a75d3776d9 am: a5d11ba79b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

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

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

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

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

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

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

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

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

Change-Id: I2f1bdd4b0bf84c11349da6f234ffca9ae9874b70
 2020-06-30 02:18:01 +00:00