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
TreeHugger Robot
8cfdb03d35
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-07-05 07:27:44 +00:00
TreeHugger Robot
16ec6ea598
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-07-05 07:27:44 +00:00
TreeHugger Robot
933ba96b28
Merge changes from topic "tc_change_22070415_28"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 219678d5f9
Import translations. DO NOT MERGE ANYWHERE
2022-07-05 07:27:44 +00:00
Bill Yi
925bb87e0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b4523a0392
-s ours am: 3c98297091
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170617
Change-Id: I2e643360a1238afd29c695586a3b4b9d8d285d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 06:53:15 +00:00
Bill Yi
3c98297091
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b4523a0392
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170617
Change-Id: Ie9becfd41fa444791dea13a3179964c8cae3951c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 06:35:08 +00:00
Automerger Merge Worker
54cb09f253
Merge changes from topic "am-101ab8c296574b6fa95fe50a0dfbd6c6" into tm-d1-dev-plus-aosp am: 37b35470e5
am: 1e78c7f9fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I21712c7c62519d0df33e53f4bdee50751cf2605c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:20:37 +00:00
TreeHugger Robot
25f5d22701
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours am: c5c74f5a8a
-s ours am: 7c0cda59e5
-s ours am: 9fe1129b91
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I802b81d03747a9de06e3545e1ae2ac3fa7a7a34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:20:33 +00:00
TreeHugger Robot
5ca7c307bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours am: bdec4b1993
-s ours am: b5fecdc118
-s ours am: 8881007475
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I9823059c0fcff1ba8a2826c3101ae0752d906272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:19:24 +00:00
Bill Yi
f32c03ef4b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours am: 6e16015e80
-s ours am: d80383c45b
-s ours am: bce3417067
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I198de7796e0de3f7189d52ef089b8404c5898e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:19:19 +00:00
Automerger Merge Worker
1e78c7f9fb
Merge changes from topic "am-101ab8c296574b6fa95fe50a0dfbd6c6" into tm-d1-dev-plus-aosp am: 37b35470e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: Ib1451487c0d131eb045401888c53ffde9a8da048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:19:10 +00:00
TreeHugger Robot
9fe1129b91
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours am: c5c74f5a8a
-s ours am: 7c0cda59e5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I68c10c546461af131c3cc35259ab855e00a9908f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:19:03 +00:00
TreeHugger Robot
8881007475
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours am: bdec4b1993
-s ours am: b5fecdc118
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I31ebc0dec5b108cf4710be429820ced5883f6e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:18:21 +00:00
Bill Yi
bce3417067
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours am: 6e16015e80
-s ours am: d80383c45b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I193de310e4ece8f0d24c238e96dc88dcf36f9517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:18:17 +00:00
Bill Yi
d0e522f663
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874
-s ours am: 42a9f1d87e
-s ours am: 0ce2ae9b4d
-s ours am: 99d6934178
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169719
Change-Id: Ic99427eee7974a1a447a7fc5424f10d57379a0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:16:15 +00:00
Bill Yi
def6f90bda
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874
-s ours am: d656305b74
-s ours am: c900d74b13
-s ours am: 126296787d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169719
Change-Id: Ia94103e154c1c6de843e7f908a39992a6ba02f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:11:43 +00:00
Automerger Merge Worker
37b35470e5
Merge changes from topic "am-101ab8c296574b6fa95fe50a0dfbd6c6" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours am: c5c74f5a8a
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours am: 0b94e5f66d
-s ours
2022-07-05 03:03:11 +00:00
TreeHugger Robot
7c0cda59e5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours am: c5c74f5a8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I4cca53c7defad87c2527d520688f8e70b989e6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:02:44 +00:00
TreeHugger Robot
b5fecdc118
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours am: bdec4b1993
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: Ic53497ffafc18c85523a65dd07418d4284da6605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:02:43 +00:00
Bill Yi
e72fe90737
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours am: 0b94e5f66d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: Ie48cebd20af0c9762e39ad687eb85307e4e0148c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:02:40 +00:00
Bill Yi
d80383c45b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours am: 6e16015e80
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I53b07930f0e9bf2785eb72bde32d4fe60e70ca1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:02:39 +00:00
TreeHugger Robot
f81dd9ca43
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours am: f9dd87268a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: If19a53b23dd87e9929ed62c150bc8339583c4a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:02:02 +00:00
Bill Yi
4db1edc362
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours am: dafb394cbb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: If455d5615b4b70afc0e86dda0e60313d5e4c5f50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 03:02:00 +00:00
Bill Yi
99d6934178
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874
-s ours am: 42a9f1d87e
-s ours am: 0ce2ae9b4d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169719
Change-Id: Ic423dda5f3dfd2e578d091eb91d0c4a8c3dcd34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:46:05 +00:00
TreeHugger Robot
bdec4b1993
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I40171e45c01394cb86fe38d0bbde39540906e362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:43:41 +00:00
Bill Yi
6e16015e80
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: Ie98f930ded26e6668da3c5fe60b70df7436d3b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:43:34 +00:00
Bill Yi
126296787d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874
-s ours am: d656305b74
-s ours am: c900d74b13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169719
Change-Id: I0d130bc4321a3f78d260f82159921a0925c5fca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:43:07 +00:00
TreeHugger Robot
f9dd87268a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I2f0f272c0b31af2718f7794bb61792df519693c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:42:38 +00:00
TreeHugger Robot
c5c74f5a8a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I6de70d1e703e3632363a72885dc5ad5285318116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:42:35 +00:00
Bill Yi
dafb394cbb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I3ab7d56a8aac838e698bb6c678a8fbf85940773b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:42:32 +00:00
Bill Yi
0b94e5f66d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I8af9335c44b365900d73ec367d38825e4a103aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:42:28 +00:00
TreeHugger Robot
e2cd20fa19
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-05 02:25:30 +00:00
Automerger Merge Worker
7c3a0483a7
Merge changes from topic "am-f5e1ab0936be49f5be84d3c326e7f8fc"
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6f09916f9d
-s ours am: 3512ebb5cd
-s ours am: 773f48bac4
-s ours am: 1856648ca3
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d5864095
-s ours am: 0890e485b7
-s ours am: 7ed996df9b
-s ours am: d385d2f837
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f4237da27
-s ours am: 99d07e12da
-s ours am: 8cbbe62278
-s ours am: b325ba1cc0
-s ours
2022-07-05 02:22:02 +00:00
Bill Yi
0ce2ae9b4d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874
-s ours am: 42a9f1d87e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169719
Change-Id: Ieee749ba4171acf12f08a41b77d75e2ab60c191e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:18:54 +00:00