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
TreeHugger Robot
ae9c414092
Merge "Add test cases for highlight Preference click behavior"
2022-07-04 13:08:53 +00:00
Arc Wang
69974d0c4f
Add test cases for highlight Preference click behavior
...
On large screen Activity embedding devices, Settings homepage
shows a highlighted Preference which is mapped to current
right pane.
For better UX, when users click again on a highlighted Preference,
it should not launch SubSettings.
Fix: 236275503
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard.DashboardFeatureProviderImplTest
Change-Id: I222c9b015fb090f359c3c9f4187823477920715b
2022-07-04 18:20:22 +08:00
TreeHugger Robot
e0c452a140
Merge "Fix memory leak in TetherSettings"
2022-07-04 02:31:26 +00: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
fd6c0f6a45
Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp am: 6e4fd42dac
am: 77a97bba64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: Ia02b97aef7ae8f85bee8527a482f3be2390ac8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:58:21 +00:00
TreeHugger Robot
20ea89bdad
[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: 5f246992e4
-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: Ia8746beb2781751127e4abdac6daafe740e27232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:58:06 +00:00
TreeHugger Robot
360bb6df50
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: 2ec12f7701
-s ours am: 4da1e46d66
-s ours am: 41a2371036
-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: I776b2d298cf64036278599c605706a47ba09fc37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:52:49 +00:00
Bill Yi
53e119c78b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours am: 281a9b7507
-s ours am: bd65c258bb
-s ours am: 5e2224db6c
-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: I3c211c4878b321c2953a2be704311389ffe57749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:52:32 +00: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
TreeHugger Robot
41a2371036
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: 2ec12f7701
-s ours am: 4da1e46d66
-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: Ib3d1989e486cf0e4a5096d121dec0e4ec34ce80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:47:21 +00:00
Bill Yi
5e2224db6c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours am: 281a9b7507
-s ours am: bd65c258bb
-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: Idba5f61cb6efbb06fe5ba351a1d031a437536b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:47:07 +00:00
Automerger Merge Worker
6e4fd42dac
Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: ec5ba801ba
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours am: e5e9661324
-s ours
2022-07-01 16:25:48 +00:00
TreeHugger Robot
41d9c1ccb7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: ec5ba801ba
-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: I48d9bcd4fe47e20f2d4d374c0d9862fae442be21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:23:59 +00:00
TreeHugger Robot
4da1e46d66
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: 2ec12f7701
-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: I211dcf4f7569227e72d6d7927c031e5e1c321f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:23:50 +00:00
Bill Yi
cd8d1eecd8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours am: e5e9661324
-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: I7745af204a16d8efc774ffa8c7ee8adc71551a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:23:43 +00:00
Bill Yi
bd65c258bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours am: 281a9b7507
-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: I5acd27c0c6052afa3a891d01c39e0c67f01b253f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:23:30 +00:00