Commit Graph

100528 Commits

Author SHA1 Message Date
Bill Yi
421f150b35 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours am: 1f54a37763 -s ours am: 49b531be9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4987c04b9325a3d09bd49863dde79a9a37ab94fa
2022-02-24 19:44:17 +00:00
TreeHugger Robot
68ad2ce621 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours am: 950a131827 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I512ae908011164f188a28a8befb50542e2f69b38
2022-02-24 19:05:22 +00:00
Bill Yi
5cb4595be4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours am: 8b2c75107f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9988feb70308f562bd93496325e5544f183c54c5
2022-02-24 19:05:21 +00:00
Bill Yi
f446b700a2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours am: 91c6687b8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: If993d229eae2f3820b4e25f53ac5f846d296334b
2022-02-24 19:05:14 +00:00
Bill Yi
91859b0853 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours am: b4fb92af4b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifff0716f27d23fc78d64a09a54b52770ea511a2e
2022-02-24 19:04:33 +00:00
TreeHugger Robot
637ff8a720 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours am: 7b4af603b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7ed14fd6f982b4570fe15cf296aa85485f229bd3
2022-02-24 19:04:16 +00:00
Bill Yi
9d87ccd670 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours am: 4c23b861ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe351b4744fee6ca004f488266f50b482f49a94f
2022-02-24 19:04:15 +00:00
Bill Yi
f4a111cdcf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours am: 1f54a37763 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iacb71005a26e2918a715925d4f739412e5319b8d
2022-02-24 19:03:33 +00:00
TreeHugger Robot
950a131827 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieca92a3de4bf92b268b37408689821d3e2291a5b
2022-02-24 19:03:23 +00:00
Bill Yi
8b2c75107f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If46ab67657eddcf52094c39690d5267795c21697
2022-02-24 19:03:21 +00:00
Bill Yi
91c6687b8d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours am: 30a5c5bf0a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98aeb0a1043ebf20c998e2d59d30600b4e795142
2022-02-24 19:02:42 +00:00
Bill Yi
b4fb92af4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours am: 8bcdd557ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic09273a1108e7c9942dea93c8b8800d4d3c7417a
2022-02-24 19:01:27 +00:00
Bill Yi
49b531be9c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours am: 1f54a37763 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I047034a51ff408c903e9932170f468d635a81094
2022-02-24 18:49:05 +00:00
TreeHugger Robot
50b53a1c58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1f4c1cb5357a491c77bdf93d340d98d59e059b4
2022-02-24 18:38:40 +00:00
Bill Yi
340aa20e39 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie1a4136bce85ad506e47f66f8806f6af86a4918e
2022-02-24 18:38:38 +00:00
Bill Yi
30a5c5bf0a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4bfb833ef6a25a62bdabc4aa251d0a8930bf22e4
2022-02-24 18:38:22 +00:00
Bill Yi
8bcdd557ad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica0ed6810627f1fd0d72ca966f1096285ef2e40e
2022-02-24 18:37:13 +00:00
TreeHugger Robot
7b4af603b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08953b72649f22b940aa71035fd74d5f168143c9
2022-02-24 18:26:32 +00:00
Bill Yi
4c23b861ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idec4de9dc19f222445eb564a4ddaf75425f96f14
2022-02-24 18:26:30 +00:00
TreeHugger Robot
b3efaa654e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8850b59a5b02dd11a1f8ffaeeb8bb2ef0fabca90
2022-02-24 18:26:27 +00:00
Bill Yi
3d349c1688 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0f31cd384cdea4944f63a73a0ec8793a21b11f9
2022-02-24 18:26:24 +00:00
Bill Yi
1f54a37763 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7933a10f4846837ef65d4cb98a0e896bef9db840
2022-02-24 18:26:06 +00:00
Bill Yi
31a5b89eef [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id72c779f290a0e76622bc5dda67dca65c5c63998
2022-02-24 18:26:06 +00:00
Bill Yi
dc4656cb7c Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-02-24 18:05:43 +00:00
TreeHugger Robot
a18ff15076 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-24 18:05:30 +00:00
TreeHugger Robot
e79968b58b Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-02-24 18:02:28 +00:00
TreeHugger Robot
24bd47eda7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-02-24 18:00:29 +00:00
TreeHugger Robot
139331e47f Merge "[Panlingual] Adds log and have small refactor." 2022-02-24 17:08:44 +00:00
Julia Reynolds
6a663c3dff Merge "Remove unnecessary async" into tm-dev am: 1d15b24da2 am: 9d01ed5377
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990592

Change-Id: Ia62d904084968418387dd231bbd58430afb98977
2022-02-24 16:43:23 +00:00
Julia Reynolds
9d01ed5377 Merge "Remove unnecessary async" into tm-dev am: 1d15b24da2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990592

Change-Id: I748563c902ee32443596e6e95a5784dfdcbd6b9d
2022-02-24 15:46:23 +00:00
Julia Reynolds
1d15b24da2 Merge "Remove unnecessary async" into tm-dev 2022-02-24 15:30:02 +00:00
TreeHugger Robot
4257b0e1e8 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 am: fd9774a633 am: 606488fea8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I244fdc314d97d6a5ce4a87293689735326ee8af1
2022-02-24 14:52:48 +00:00
Bill Yi
c6def3b1bf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours am: 23bac2fa39 -s ours am: 548359ddf9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4719d2d642a7d6fc6ea521454c4c2b95b13ae530
2022-02-24 14:52:46 +00:00
TreeHugger Robot
d8dcff4eac Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 am: fd9774a633
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I91779796d31881527854776514ce87e4e6751365
2022-02-24 14:52:30 +00:00
Bill Yi
efdd5ffb3b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours am: 23bac2fa39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I96fbfaef0a0b0d9708aa1b449cde3c513cdaf516
2022-02-24 14:52:24 +00:00
Bill Yi
16408207f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours am: fd463afb87 -s ours am: a6182064cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3dea6959f89028575d626fa81f1faa84df09d8fe
2022-02-24 14:41:10 +00:00
tom hsu
f2613fc56b [Panlingual] Adds log and have small refactor.
Bug: 218660171
Test: local
Change-Id: Icedc6808c9115afc996f435bfd4ca59e20c781ab
2022-02-24 22:34:10 +08:00
Bill Yi
41275380bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours am: fd463afb87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f5e60d154f979c6e744ee5a0df3d35585efeddc
2022-02-24 14:31:01 +00:00
PETER LIANG
7ed4f3343e Merge "Polish and humanize the summary for Display/Font size." into tm-dev am: 78310383b0 am: 713208f556
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996808

Change-Id: Ie015fe844099333b27fd9968931171578a7605d4
2022-02-24 14:17:45 +00:00
Marie Matheson
15c15ecdad Merge "Rename safety source ids to match format from other apps." into tm-dev am: aa43d6f06b am: 079d7f45e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16981670

Change-Id: Ibc3df37f6755b12a0f0ac0ca89925d5c8ae8971a
2022-02-24 14:06:33 +00:00
TreeHugger Robot
606488fea8 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 am: fd9774a633
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I3aa3946eb83e2f47bf155d3a147d04390ec91234
2022-02-24 13:57:29 +00:00
Bill Yi
548359ddf9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours am: 23bac2fa39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id021f7b3061fc2b31c5d7c5d52f6cd1e3b571a58
2022-02-24 13:57:25 +00:00
Bill Yi
a6182064cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours am: fd463afb87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dc2b64ab281b5f5a47654b6e0d7953b852871e8
2022-02-24 13:57:18 +00:00
TreeHugger Robot
fd9774a633 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I6c5a360d12c0b093f960a4916173d6e58549cfbd
2022-02-24 13:56:58 +00:00
Bill Yi
23bac2fa39 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic540fe2f3bf75422c829fb89b022e69cc9535fad
2022-02-24 13:56:47 +00:00
Marie Matheson
b44774b3af Merge "Rename safety source ids to match format from other apps." into tm-dev am: aa43d6f06b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16981670

Change-Id: I2a0dbc58ee5eafa8ded57a83e96af1d1fa686cb9
2022-02-24 13:56:09 +00:00
PETER LIANG
713208f556 Merge "Polish and humanize the summary for Display/Font size." into tm-dev am: 78310383b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996808

Change-Id: Iaa997f919b2ba28d352de910d53f0bb78316c906
2022-02-24 13:54:51 +00:00
Bill Yi
fd463afb87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad43b14f466e956f7d7df3e6ff3cbff9b195d448
2022-02-24 13:52:48 +00:00
PETER LIANG
78310383b0 Merge "Polish and humanize the summary for Display/Font size." into tm-dev 2022-02-24 13:28:17 +00:00
Peter_Liang
e9b6679971 Polish and humanize the summary for Display/Font size.
Fix: 220071533
Test: manual test
Change-Id: Id09e97f23263bd118c461b6570165f55d62f9881
2022-02-24 13:26:13 +00:00