Commit Graph

110137 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
b55af7d44d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I457c216efddb0aff3f15c205d2bda71edc386e1b
2022-07-04 11:44:35 -07:00
Bill Yi
72d5864095 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
2022-07-03 14:12:52 -07:00
Bill Yi
1f4237da27 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic08c9ecc8d5fe64b43b00c9f87860ee2a5f5b46b
2022-07-03 14:08:30 -07:00
Automerger Merge Worker
77a97bba64 Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp am: 6e4fd42dac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489

Change-Id: I4888f6731485a54624e5e940fa06e1f377247c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:51:58 +00:00
TreeHugger Robot
5f246992e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours am: 41d9c1ccb7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2e20e2104eedd3f891d741ae6c0ad82fb536a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:51:43 +00:00