Commit Graph

74141 Commits

Author SHA1 Message Date
Bill Yi
ae9583bf95 [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 273e88795b -s ours am: 9b3ab482ae -s ours am: 1c71cb9d17 -s ours am: 6bc6a1f999 -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: Iec147f8cacdcbb54d6dc7ef54bade5fdf48a9820
2020-07-03 18:10:06 +00:00
TreeHugger Robot
58463912b6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1ba8b63d47 -s ours am: f59db32bd0 -s ours am: b945544949 -s ours am: 32f968dd67 -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: I5c6614a772d1f6489083c14b6f7385ad0cd22d10
2020-07-03 18:10:00 +00:00
Bill Yi
c1e318647d [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 83a61a3847 -s ours am: fadcbff68c -s ours am: b95aa08069 -s ours am: 801f7c7199 -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: Ifceb371a5467f39fb9ec8ef76d22d4667d67e8d8
2020-07-03 18:09:55 +00:00
Automerger Merge Worker
476fd0dba5 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8f48b24724 -s ours am: 1ae1da207d -s ours" into rvc-qpr-dev-plus-aosp am: 9d1e1ecabd -s ours am: 57912c6bc4 -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: Ic8c80b828a688ddbf13097e210cdb749efedac56
2020-07-03 18:09:50 +00:00
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
Bill Yi
6bc6a1f999 [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 273e88795b -s ours am: 9b3ab482ae -s ours am: 1c71cb9d17 -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: Ia6fc04098232e0acf7e66d60fd8cd2c6f9a0cd87
2020-07-03 17:58:50 +00:00
TreeHugger Robot
32f968dd67 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1ba8b63d47 -s ours am: f59db32bd0 -s ours am: b945544949 -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: Ie20f7f16854b37dab0e06539a3b22037492b33e6
2020-07-03 17:58:44 +00:00
Bill Yi
801f7c7199 [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 83a61a3847 -s ours am: fadcbff68c -s ours am: b95aa08069 -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: Id42ebe848a4aaa165d6b69513a11eb3c18006e64
2020-07-03 17:58:38 +00:00
Automerger Merge Worker
57912c6bc4 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8f48b24724 -s ours am: 1ae1da207d -s ours" into rvc-qpr-dev-plus-aosp am: 9d1e1ecabd -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: I262a2bf8fe951541cdf94bb1740be16e042d713d
2020-07-03 17:58:31 +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
Bill Yi
1c71cb9d17 [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 273e88795b -s ours am: 9b3ab482ae -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: I145fa3783436a7228bdac04950708b3056a2e902
2020-07-03 17:53:50 +00:00
TreeHugger Robot
b945544949 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1ba8b63d47 -s ours am: f59db32bd0 -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: I3e52e4be43cc0606c616b338dd6b454e9653c984
2020-07-03 17:48:30 +00:00
Bill Yi
b95aa08069 [automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours am: 83a61a3847 -s ours am: fadcbff68c -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: I3935003f0919e59f232613a2c25f093e3117f3c5
2020-07-03 17:48:24 +00: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
Automerger Merge Worker
9d1e1ecabd Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8f48b24724 -s ours am: 1ae1da207d -s ours" into rvc-qpr-dev-plus-aosp 2020-07-03 17:48:21 +00:00
Bill Yi
4fd37dec55 [automerger skipped] Import translations. DO NOT MERGE am: 8f48b24724 -s ours am: 1ae1da207d -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: I46cd1298886e2d9ca365af8ead1b62c7ab2dcac3
2020-07-03 17:48:16 +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
f59db32bd0 [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: I5323d035dffdc0bf28ee9afc23f22be7e4b69766
2020-07-03 17:41:26 +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
fadcbff68c [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: I14b8226fff771e821145356ed24dea5eb3b7ce81
2020-07-03 17:35:24 +00:00
Bill Yi
1ae1da207d [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: I72335b0a0f6773ea3aa00b980a89e482b0a2014e
2020-07-03 17:35:19 +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
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