Commit Graph

113253 Commits

Author SHA1 Message Date
Bill Yi
f49d2cac6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: f6c853f21e -s ours am: e95e7cd6ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: If828424828f25b71340e2b0e1fae336d642463e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:51:59 +00:00
Automerger Merge Worker
ebbbb2ee44 Merge changes from topic "am-8bf96599a11b464c8ec090f901343f7c"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours am: d5c5fdda14 -s ours am: 131976f2f5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours am: 4e53b0a04c -s ours am: aea4fecb34 -s ours
2022-07-06 06:24:38 +00:00
Bill Yi
b457d2c596 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 36139e2e09 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I308ba40d351c8a28fa297ad886a71ccdc99f8af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:22:07 +00:00
Bill Yi
88f8dca7ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: e73c1c14be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8dd850b6af3defb96644443b644b0375e19c93fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:22:02 +00:00
Bill Yi
aad1e36cb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: 93f6d69a60 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9f86da914a30c5904389ba49ed210be02de774a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:21:52 +00:00
Bill Yi
f31a0eb66a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours am: d5c5fdda14 -s ours am: 131976f2f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14b28cf2605112370955a751a4d47ac9cbf2fd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:20:46 +00:00
Bill Yi
f69119f24a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours am: 4e53b0a04c -s ours am: aea4fecb34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I573c272f12a427e407df3a18de4ed2b469719f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:20:32 +00:00
Bill Yi
f5ff147eca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 23a80ba165 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib11a2e6745ae943b01ec9f15dd5cd69e8c1c151e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:19:35 +00:00
Bill Yi
c723c4913e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 00ce7a948f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic41758a31901b43de59eea31858360f717ef9273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:19:30 +00:00
Bill Yi
692468d5ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: 3296352cb0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0a260dd2787fbf55b38be799cc185bda12c8468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:19:30 +00:00
Bill Yi
4001ea3f7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: f3be71db07 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46716d9022aabb67eb72684616c1112ed0eaf25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:19:24 +00:00
Bill Yi
e95e7cd6ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: f6c853f21e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc8ca674cdd9a102e5a47a2bedbbb97d7c27a0cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:19:20 +00:00
Bill Yi
588a54e146 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: f93ba2665c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7cd7804bc7a67249f52084e15b51d57abe6b76d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:19:16 +00:00
TreeHugger Robot
0300239d77 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours am: c8a0d723a8 -s ours am: 6c0cb3ede1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a5390b240d21805d68563095792608ef596df57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:18:43 +00:00
Bill Yi
b72647ce59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours am: fcf27909d7 -s ours am: fe1de885b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife07ec4167f52e37746944caf064c3810419e2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:18:38 +00:00
Bill Yi
131976f2f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours am: d5c5fdda14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7b96e65d3f75149d78cbf87e56bf7fbeea8f727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:03:39 +00:00
Bill Yi
aea4fecb34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours am: 4e53b0a04c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7da49f0bb66080403ff8939943494fc7360a0e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:03:23 +00:00
Bill Yi
36139e2e09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebdf15669ab9453f15e44fabade6a50d13446fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:02:56 +00:00
Bill Yi
e73c1c14be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00a05a9484f3455c6253361cb874b46c8298148e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:02:48 +00:00
Bill Yi
93f6d69a60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1c3ff6920f33eaeb414b73b4d16f4bd36cf2773d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:02:40 +00:00
Bill Yi
23a80ba165 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0855ac7f08ed8b89a777d6ad44d055ea4587d1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:02:11 +00:00
Bill Yi
3296352cb0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb762e9b5d1c59fdb134231c957be4fa03b21a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:02:03 +00:00
Bill Yi
f6c853f21e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I854f5987c485074367678b4028f88d2bf483b2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:01:56 +00:00
Bill Yi
00ce7a948f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3553d1cd90c1cb6665d184141836e8c7365bc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:01:48 +00:00
Bill Yi
f3be71db07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic5f7eb29a2676dc6aaf8a27e49bc588292ae62c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:01:40 +00:00
Bill Yi
f93ba2665c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4cd5f4431b71081bb15851602691052d8250157b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:01:35 +00:00
TreeHugger Robot
6c0cb3ede1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours am: c8a0d723a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55b7c83380ec44b3c6b8e86728f69cb26f8125c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:00:38 +00:00
Bill Yi
fe1de885b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours am: fcf27909d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4ca9bbca464a7e0443b2ecafe9cf9f2118c325a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:00:35 +00:00
Bill Yi
d5c5fdda14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2d7663f8aa28b4fcf7f714e35a66c48e1e185af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:44:41 +00:00
Bill Yi
4e53b0a04c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9bd798dcced11ae83b9341e3ebe4e7ff4c29e100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:44:24 +00:00
TreeHugger Robot
c8a0d723a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide7b7cd9b8386e61fb6d98326a603ba24f17deb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:41:47 +00:00
Bill Yi
fcf27909d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d52ec5e318e99cfaa2402d8b6672fa4d97594e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:41:37 +00:00
Bill Yi
1fd3156ec7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e9f640550a6ba839080bf5db6a76def2ca2f7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:34:08 +00:00
Bill Yi
992e8328bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6664f45591969573c47e8de87c2aa1f9015ddc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:34:05 +00:00
Bill Yi
50eb4245cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id50143411336cc13e6c029cb2789150b50544f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:33:54 +00:00
Bill Yi
9fc986d019 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-06 05:07:11 +00:00
Bill Yi
308b5d00e9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-06 05:07:11 +00:00
Bill Yi
eda8321a12 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-06 05:06:38 +00:00
Bill Yi
44c1f479d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-07-06 05:05:28 +00:00
TreeHugger Robot
d5c37555b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-06 05:03:07 +00:00
PETER LIANG
0e887c9fb0 Merge "Avoid the reset item having inconsistent alignment with the others under SuW." 2022-07-05 14:58:38 +00:00
TreeHugger Robot
0abfd5c416 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f29e93bf9e -s ours am: 5067a22ec6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28d676d66a7406970111677c95b182f0fe96029c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 08:15:32 +00:00
Bill Yi
084d4d2db8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b8ae8cd5c5 -s ours am: a2218a2ec7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic2d8e774c09fef44f9651ad68a4e00ffcde0f872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 08:15:12 +00:00
TreeHugger Robot
5067a22ec6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f29e93bf9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0e288f8817e6f0734b74e5cf06d7b319b976d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 08:05:16 +00:00
Bill Yi
a2218a2ec7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b8ae8cd5c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4bcd9c20c4c7d95dd43584d8d8f8a16d6187b9bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 08:04:59 +00:00
TreeHugger Robot
f29e93bf9e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-05 07:47:58 +00:00
TreeHugger Robot
fdf6228079 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8cfdb03d35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23096c174122456469b24f434bcb89b70f8312ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 07:46:42 +00:00
TreeHugger Robot
4f39061375 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 16ec6ea598 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd0d24215928eed2e36b2f931cec24ca033cf0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 07:45:50 +00:00
Bill Yi
fe21707278 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6da62ec091 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1139474e867a5a5d198f6be886997d11325c28fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 07:45:45 +00:00
Peter_Liang
772e114438 Avoid the reset item having inconsistent alignment with the others under SuW.
Replaces the LayoutPreference with native Preference for the reset preference which is used for resettings the status of all preferences.

Bug: 232528123
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingResetControllerTest,TextReadingResetPreferenceTest
Change-Id: I00719f13dc78039269ee373c6b35e12e7ff595ce
2022-07-05 15:32:37 +08:00