Commit Graph

113338 Commits

Author SHA1 Message Date
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
TreeHugger Robot
ca126e9447 [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
am skip reason: subject contains skip directive

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

Change-Id: I243340e98345b5fb3e7c11d50098b92c73910910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 02:18:35 +00:00
Bill Yi
680c95262d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d5864095 -s ours am: 0890e485b7 -s ours am: 7ed996df9b -s ours am: d385d2f837 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I544d0e56f375075f2cbd302b4e40ed8f2235533e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 02:18:21 +00:00
Bill Yi
756b068e7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f4237da27 -s ours am: 99d07e12da -s ours am: 8cbbe62278 -s ours am: b325ba1cc0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8c8a97510c0cffdad69c7c24249bc72a14da24fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 02:18:04 +00:00
Bill Yi
19f34ea232 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -s ours am: 1ab546b2f7 -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: I5c3f68e85353132db6885a356b3d59a460336c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 02:18:03 +00:00
Bill Yi
c900d74b13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -s ours am: d656305b74 -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: I1d6014f1185f08a82dc9d1b97c8996502e8bca0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 02:17:31 +00:00
TreeHugger Robot
1856648ca3 [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 skip reason: subject contains skip directive

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

Change-Id: I8637cdc92cb00acc7e12394bc397a0f46e3e33eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:58:37 +00:00
Bill Yi
d385d2f837 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d5864095 -s ours am: 0890e485b7 -s ours am: 7ed996df9b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2592ec50c3f0cb085eca73ebe8a36dd8b2bafc57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:58:21 +00:00
Bill Yi
b325ba1cc0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f4237da27 -s ours am: 99d07e12da -s ours am: 8cbbe62278 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0e9bbbf64cfff4b9a746fe892294648d5e89cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:58:05 +00:00
Bill Yi
d656305b74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -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: I6c6ff6cd408fb35ac2604c17787bdc5e3ab96609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:51:50 +00:00
Bill Yi
42a9f1d87e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -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: I9758a1fe9b7cf21bd95d0bb0d3d1dc63604b557b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:51:34 +00:00
Bill Yi
1ab546b2f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -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: Ifbf36dc3562fb31343c8095d77827b58cd46a83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:51:11 +00:00
TreeHugger Robot
773f48bac4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6f09916f9d -s ours am: 3512ebb5cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3823139fa0469783cc2418725b59e63b30c9a8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:32:56 +00:00
Bill Yi
7ed996df9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d5864095 -s ours am: 0890e485b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3409df149abe3ee5dac460a2574a74f5f8d4c33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:32:42 +00:00
Bill Yi
8cbbe62278 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f4237da27 -s ours am: 99d07e12da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3033f21a14c27b4b4d26e8eab0face01f85e8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:32:23 +00:00
TreeHugger Robot
3512ebb5cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6f09916f9d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I511901375a3715a64bc7fa39d172c26289e26bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:12:36 +00:00
Bill Yi
0890e485b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d5864095 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief0ca40acbf2f0911e37a287fe7ce9bd2097e218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:12:19 +00:00
Bill Yi
99d07e12da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f4237da27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49c81a9ccbfec0f3542f6c1f72c92da212d11091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:12:04 +00:00
TreeHugger Robot
6f09916f9d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-07-05 00:45:36 +00:00
Bill Yi
59ab9e4713 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 219678d5f9
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib4a827df7c0cc4afe61d4ddce308adf0003316ad
2022-07-04 22:28:03 +00:00
Bill Yi
d2b251ec36 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I750415ef848997b21de83b901e41bcf2b141777e
2022-07-04 12:21:22 -07:00
Weng Su
08adf4c2ed Ignore CRLF strings in display SSIDs to avoid display errors
- Keep user-entered SSIDs in Wi-Fi Configuration

- Ignore CRLF strings in display SSIDs only

Bug: 224545390
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest

Change-Id: Ifc081f9c5c02b2d70412f296688b88e44e893add
2022-07-05 03:18:26 +08:00
Bill Yi
b4523a0392 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I28a1a8af7e44edb875d10d7cc989e1521108aafb
2022-07-04 12:17:11 -07:00
Bill Yi
72134f4c83 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaab33a1f7bdac3231cad97238a8e9cb23427dc58
2022-07-04 12:12:55 -07:00
Bill Yi
d2b24bfc0a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I72c40ddf49236c03bb2c8834bb95bc6444a6ab4c
2022-07-04 12:08:29 -07:00
Bill Yi
80c1acdaf0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8aeff68684c763f108bdba696080011e60301ad9
2022-07-04 12:04:22 -07:00
Bill Yi
b8ae8cd5c5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I97697f451f1420bccede0fe8d345c2c02146c6f0
2022-07-04 12:02:33 -07:00
Bill Yi
cab8532874 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6a7c146633f64ddf3a5b0810491dd8753be7d18b
2022-07-04 12:00:44 -07:00
Bill Yi
0ea30d1b60 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7c8f0cae83145c94ea3d9aae8d9a85fe2d64aeb7
2022-07-04 11:58:57 -07:00
Bill Yi
6da62ec091 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2abb57d1034b5786c72a0742ecd65698b585cd14
2022-07-04 11:54:35 -07:00
Bill Yi
2c65a1d804 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8fb18f2250c868b4015d64f81d830d0391799479
2022-07-04 11:50:26 -07:00
Bill Yi
219678d5f9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2f5d0e5cc90099e42ad3a0b8e846d49c49f06735
2022-07-04 11:46:25 -07:00
Bill Yi
b55af7d44d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I457c216efddb0aff3f15c205d2bda71edc386e1b
2022-07-04 11:44:35 -07:00