Commit Graph

86831 Commits

Author SHA1 Message Date
TreeHugger Robot
f680c9b0b5 Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
2021-08-14 07:26:53 +00:00
TreeHugger Robot
7efaff8d0f Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev 2021-08-14 07:13:12 +00:00
Xin Li
42be0d2f75 Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: Id2a8c43f9bca79200f837759ce9de0a6eba2a37a
Change-Id: I90fe22409ec7832714c8530f54408db747bdf3c4
2021-08-14 06:30:57 +00:00
TreeHugger Robot
146e5545ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: 0af8e8e5cd -s ours am: 17a08343bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d8c19007fce2f892801e3200f1cd2929a19ba92
2021-08-13 22:23:27 +00:00
Bill Yi
005b4f57a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: 15bb8d9aae -s ours am: 6e95702bd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iefe3bcc2b3aa0675d053711813d147e1c8167819
2021-08-13 22:23:06 +00:00
TreeHugger Robot
d645a1cd93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: e51ac2563b -s ours am: 69f2f00362 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibbb8659161fb436c41a7ecffdd7df66dd30c41e7
2021-08-13 22:22:49 +00:00
Bill Yi
07c3ce6345 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: c23385ba9c -s ours am: 8e53fa2ae0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iecb6154e1f17623f61ef3ed09bff6888a63680c0
2021-08-13 22:22:38 +00:00
TreeHugger Robot
4a59379253 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: cc5b59c9a4 -s ours am: 32cf5641ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6d88612981dce25921c662f0d55253d704123cf
2021-08-13 22:22:18 +00:00
TreeHugger Robot
3f94586dbd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 7508bd0cd2 -s ours am: 37dde5b3df -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e821d28135a5f6dbedd43441cdd52e13ba0277a
2021-08-13 22:21:53 +00:00
TreeHugger Robot
ea855b2730 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 96bd289bf7 -s ours am: dcd45dca23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61f0c3d356345465aa7983e9ed0c56038a6e97c2
2021-08-13 22:18:29 +00:00
TreeHugger Robot
360cfb2b6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: bd1e418efc -s ours am: d7c6436ea4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91fb2451d637f3fddd5c710aafb9f816ee51e1f5
2021-08-13 22:18:13 +00:00
TreeHugger Robot
e583bf989f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 652c469f3e -s ours am: edcd71932d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28ab402557c86ee118fc5f945575a060dedd713b
2021-08-13 22:17:57 +00:00
TreeHugger Robot
f99c370e3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 612fb2cb80 -s ours am: 4ea6925fef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d82fab1c5b79caba281a1f37fee294e00bcdecb
2021-08-13 22:17:29 +00:00
TreeHugger Robot
2354bb5b95 Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp am: afa6f208d0 am: bffa291613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919

Change-Id: Ic8e740912bff55bac6b73d6bfb19d08a2e2cd0e2
2021-08-13 22:17:04 +00:00
Bill Yi
7fcd3e9c0c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 am: f13f8b9065 -s ours am: 9a2aa2693b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia89edff655a74eac52ddcbd8951b4452ebe34030
2021-08-13 22:17:02 +00:00
TreeHugger Robot
739ee8ed8c Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp am: 255f31826f am: 3759660383
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913

Change-Id: I6f73c158b57e6fdd8be98444b10d42c5200dbea4
2021-08-13 22:15:49 +00:00
Bill Yi
4cccd4bd25 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c am: f13d3514ec -s ours am: 4948e577ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd5bb899448a01828a342c7bb66c5e612c93d68f
2021-08-13 22:15:48 +00:00
TreeHugger Robot
4559f1ee53 Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp am: 3f6005944c am: a755975337
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901

Change-Id: Ia0f69c8fb9cccde5cd4c9712d7f7b835ff5aacd3
2021-08-13 22:11:36 +00:00
Bill Yi
19188d6524 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8 am: db32ad43da -s ours am: 329d98ec28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69b61a5f40f079f99193668efb0e6a3bf816c869
2021-08-13 22:11:35 +00:00
TreeHugger Robot
a3d5a8aef5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: de4d5cb3f9 -s ours am: 693cecdc4f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4a2932287a412be9f011c49ae9c1f5f51ef4b8fa
2021-08-13 22:10:30 +00:00
Bill Yi
cc4d8d8668 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: 4a7acc1636 -s ours am: b03c6ba2ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30d8b170bc069ce4ec24b7222846c0bbbad9931b
2021-08-13 22:06:51 +00:00
TreeHugger Robot
c219d7aeb5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: 0af8e8e5cd -s ours am: 58140cecab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iccae6abaf90c3ac5d8c3bb55751029fce279ae2b
2021-08-13 22:05:16 +00:00
Bill Yi
3696b7f734 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: 15bb8d9aae -s ours am: 1fe622ea84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6d6bd58da2642c2499203284dcaf8ce33037674
2021-08-13 22:05:05 +00:00
TreeHugger Robot
71cb764e1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: cc5b59c9a4 -s ours am: 5af512fa91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21f4ae8c8745c62eb1bd9072d33cbfb53f7ee539
2021-08-13 22:04:48 +00:00
TreeHugger Robot
29fa1d02b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 7508bd0cd2 -s ours am: 40094149eb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I296f1aa85fd457e3affecdbaabb6d67483bcb106
2021-08-13 22:04:28 +00:00
TreeHugger Robot
3fc13ba9f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 96bd289bf7 -s ours am: 1add1250a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I555c2c5786677d3a8d1b228ebae6913e6816500b
2021-08-13 22:04:04 +00:00
TreeHugger Robot
fe687b44c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: de4d5cb3f9 -s ours am: e5bdfacb0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d158910d4f6b7479dbd610c6563a7ea3a4e7929
2021-08-13 22:02:12 +00:00
Bill Yi
ca04371b27 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: 4a7acc1636 -s ours am: 4310165e62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1993dd480e0c7cbad3ce46f8996cbeb33ccf4d9f
2021-08-13 21:58:04 +00:00
TreeHugger Robot
a910c6c52d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e4e2fb715f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7cd4b4f8381f7cd23e54b2217ef492ac61189df6
2021-08-13 21:38:01 +00:00
TreeHugger Robot
ca1bbb9f09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: e245bf8e66 -s ours am: e4de411880 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6afe1e73bf229e8ea056dbf47e53d83fdf7595d
2021-08-13 21:34:32 +00:00
Bill Yi
c303aa8b0c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: e7eff15e83 -s ours am: 4d68983581 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b86bd0df673f2e41d41bce1934c37ded3a8141d
2021-08-13 19:56:31 +00:00
TreeHugger Robot
17a08343bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: 0af8e8e5cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ba4dec8d28bdbe01c84416331040d1c3d67d20b
2021-08-13 19:45:03 +00:00
Bill Yi
6e95702bd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: 15bb8d9aae -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebc1f394ba75463a6743808a97bea0ec1655c98b
2021-08-13 19:44:56 +00:00
TreeHugger Robot
58140cecab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: 0af8e8e5cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd11a6a82704c175406f8e2c3dfd6cdf51530376
2021-08-13 19:44:43 +00:00
Bill Yi
1fe622ea84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: 15bb8d9aae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40521b8ab455a2c08736f6c733eb269000b2611a
2021-08-13 19:44:39 +00:00
TreeHugger Robot
69f2f00362 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: e51ac2563b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2df24400a8dd1a3acef085f6b062f09ddb41cf54
2021-08-13 19:44:16 +00:00
Bill Yi
8e53fa2ae0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: c23385ba9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id29b69cda109093a834dabe7423b7a07f7d5b955
2021-08-13 19:44:02 +00:00
TreeHugger Robot
0af8e8e5cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0f6ec90720888d2fce39b8f7a9f7064aa4c1e57
2021-08-13 19:32:44 +00:00
Bill Yi
15bb8d9aae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib46ff621c7f360961004af6281f08e3ced8acc59
2021-08-13 19:32:41 +00:00
TreeHugger Robot
e51ac2563b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I681b191d4353cdbd88bf7da2b01afae2229b366b
2021-08-13 19:31:54 +00:00
Bill Yi
c23385ba9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1743568b80aff5c6d89c328368f808ede831811c
2021-08-13 19:31:46 +00:00
TreeHugger Robot
e069033c61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: fa782b4578 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45a563823b85397a1c6bccc7fec8311cbaa4e255
2021-08-13 19:27:00 +00:00
TreeHugger Robot
32cf5641ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: cc5b59c9a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie809525a625dd54ec03c337315c81a4206053989
2021-08-13 19:19:00 +00:00
TreeHugger Robot
37dde5b3df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 7508bd0cd2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If494bf48172fe36d789b46b653edcf76f993f261
2021-08-13 19:18:46 +00:00
TreeHugger Robot
d3a02937ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad4634164373b9bdfff5b8a8ad9895c9696bca40
2021-08-13 19:18:31 +00:00
Bill Yi
04c33bbf71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic593602b09a52dc77d36de8f7f7133668fc0182a
2021-08-13 19:17:59 +00:00
TreeHugger Robot
5af512fa91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: cc5b59c9a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie77229885fbe65b914ffe2a986d93256bee5279d
2021-08-13 19:15:06 +00:00
TreeHugger Robot
40094149eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 7508bd0cd2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I312447fd21b55256cd33eda8640e7e23357a04f8
2021-08-13 19:13:37 +00:00
TreeHugger Robot
dcd45dca23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 96bd289bf7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I839612513661798114919779ada40826ca56c22f
2021-08-13 19:12:49 +00:00
TreeHugger Robot
1add1250a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 96bd289bf7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I412835c767934fb8f9f5dd406249edaa32ddfc4c
2021-08-13 19:12:21 +00:00