Bill Yi
c4ff0995f6
[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: I9d06476ca757e386d8e5c127d7454b0455048e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 20:33:15 +00:00
TreeHugger Robot
ed552ecb6b
[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: I1db9d46a3fdd80511cbace631c180b7d8aac0767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 20:28:11 +00:00
Bill Yi
0dbf58c5c3
[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: I2dc614515ce369e668fea2724c29cfa2a834483c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 20:27:56 +00:00
TreeHugger Robot
9447ec6d81
Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev
2022-07-06 19:32:12 +00:00
Aleksandar Kiridžić
7914c77660
Merge "speech: Add on-device speech recognition settings entry" into tm-qpr-dev
2022-07-06 18:01:48 +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
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
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
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
TreeHugger Robot
ec5ba801ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-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: I5e28452c29fb27e398a4c388a85c0e347d01ee64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 15:58:54 +00:00
Bill Yi
e5e9661324
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-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: Id148d0230825c08c8afe434ef6a65c77f004c62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 15:58:38 +00:00
TreeHugger Robot
ccd485016e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-01 15:38:52 +00:00
TreeHugger Robot
2f79c879cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: I3cdd22cc82569aeb2628adae2703f80f4d8684b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:05:08 +00:00
Bill Yi
7d8e972bd7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: I9c095f83aa8c0af5dc2ef0d20772a998e2512893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:04:46 +00:00
TreeHugger Robot
2c5705010b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-07-01 06:33:55 +00:00
TreeHugger Robot
c037a7c811
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-01 03:11:28 +00:00
TreeHugger Robot
10f1d35eef
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-01 03:11:28 +00:00
TreeHugger Robot
61f8ab9027
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255
-s ours am: f4cd4b3e68
-s ours am: 26c64d0ffe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: I6cccf7aa61c976a06e37ca8fd9c3bd2aa557e979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 01:46:33 +00:00
Bill Yi
48018d069f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246dc
-s ours am: 917e5c6946
-s ours am: 3792be9679
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: I11218b030b7ca0dd451a4840768387466b086935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 01:46:20 +00:00
Bill Yi
b649de8a4e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b107521284
-s ours am: 76e5357179
-s ours am: f924935a30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133156
Change-Id: Id241a782b1f4baa84d7046d6f434f8c5a256a348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 01:46:09 +00:00
TreeHugger Robot
26c64d0ffe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255
-s ours am: f4cd4b3e68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: I4f8ab7176f5d8fc882c2d50b23fdd36d6d0ac8fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 01:22:18 +00:00
Bill Yi
3792be9679
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246dc
-s ours am: 917e5c6946
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: I630db45da9452ea99dbe0f44aad0c0d86c9dd9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 01:22:01 +00:00
Bill Yi
f924935a30
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b107521284
-s ours am: 76e5357179
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133156
Change-Id: Ibb24d88ca47a4128014c3cc986d20fafc8abbb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 01:21:42 +00:00
TreeHugger Robot
f4cd4b3e68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: Icd1c31e6aabd54fe37a1b77672e5a1dcd283149a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 00:55:20 +00:00
Bill Yi
917e5c6946
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: If9683f5b976bfab3918f005cc8b68fcf3ffd6049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 00:55:13 +00:00
Bill Yi
76e5357179
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b107521284
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133156
Change-Id: I33287c4d5f853781a2ed551193a7698a0164dcbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 00:54:56 +00:00
TreeHugger Robot
f2e5977255
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-07-01 00:34:38 +00:00
TreeHugger Robot
8a4f4b4ec6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a7ad998247
-s ours am: 05aea95695
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133163
Change-Id: Ic43f6782bb1b2d8e49f0d4545f959932d9aaa695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 00:10:50 +00:00
Bill Yi
7c11f8138c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36728d9972
-s ours am: 0514715137
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133163
Change-Id: Ide2887c8d07245a1ff44d563036b2c3f4cb543de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 00:10:38 +00:00
TreeHugger Robot
05aea95695
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a7ad998247
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133163
Change-Id: I8e10443784aeaadcfab284d95f0bcee1b8280cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 23:59:41 +00:00
Bill Yi
0514715137
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36728d9972
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133163
Change-Id: I58e7d9d40ed0da6588e88c60bd3246f04e58ebc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 23:59:23 +00:00
TreeHugger Robot
a7ad998247
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-30 23:33:57 +00:00
TreeHugger Robot
3d23905e66
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9
-s ours am: de76b7c0c0
-s ours am: 6ea0bfe56f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19126513
Change-Id: Ibb704503d1d60171c5c46fdf88659cd59db73b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 23:06:10 +00:00
Bill Yi
8e1a824f59
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359
-s ours am: e725f74df6
-s ours am: f2768dfaf0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19126513
Change-Id: I7fd0563167d650766b01d071f2a7e9fc04e15143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 23:06:08 +00:00
TreeHugger Robot
f3ccada704
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d
-s ours am: eb1fac17dd
-s ours am: b0aaf6a61d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19123681
Change-Id: I07e0f60225a79141b654879b719ff349acff6a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 23:05:57 +00:00
Bill Yi
160c53780a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657
-s ours am: 26aaae4b33
-s ours am: 6d50c8f7e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19123681
Change-Id: Ibd680c08b3881a6a0d0047a19ea3db7989e012ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 23:05:40 +00:00
TreeHugger Robot
6ea0bfe56f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9
-s ours am: de76b7c0c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19126513
Change-Id: I978d776120bd385cf5c0bca12ac2963653d9e81e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:37:46 +00:00
Bill Yi
f2768dfaf0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359
-s ours am: e725f74df6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19126513
Change-Id: I2738b7129e3c4ef609775f78a6e077285096a510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:37:43 +00:00
TreeHugger Robot
b0aaf6a61d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d
-s ours am: eb1fac17dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19123681
Change-Id: I26f6696779ac63c7c3e3ba6dd79e0b151dab561e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:37:28 +00:00
Bill Yi
6d50c8f7e4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657
-s ours am: 26aaae4b33
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19123681
Change-Id: I4fcf322dec36c2839b3de64c392ec649ed24c309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:37:18 +00:00
TreeHugger Robot
de76b7c0c0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19126513
Change-Id: Ic47779d59e4d97f612b17ed40388386030d2df8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:12:45 +00:00
Bill Yi
e725f74df6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19126513
Change-Id: I6f371ab53ed6773a539e2f02e08917c978f080bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:12:40 +00:00
TreeHugger Robot
eb1fac17dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19123681
Change-Id: Iee783066fa19d7cdbb69ddc1914798fc46233da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:12:30 +00:00
Bill Yi
26aaae4b33
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19123681
Change-Id: Ie5711ae485881b9dfb32a0da03bf07c48210940f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:12:13 +00:00
TreeHugger Robot
a28bac49f9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-30 21:51:15 +00:00
TreeHugger Robot
4fe2b9284d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-30 21:51:15 +00:00
Aleksandar Kiridzic
82ef1ef6db
speech: Add on-device speech recognition settings entry
...
Currently under `Settings > System > Languages & input > Speech` there
is a `Voice input` entry with a cog which starts the SSBG model manager
settings activity. Under the same preference group another entry
labeled `On-device recognition` is added which would open a similar
model manager settings activity, but for the on-device recognizer. That
settings activity is yet to be implemented.
The new entry should appear only under the following conditions:
- An on-device speech recognition service must be available in the
system.
- A speech recognition service with a proper settings activity
meta-data must exist in the same package as the default on-device
speech recognition service.
Bug: 235457391
Test: Manual, already existing robotests
Change-Id: I17208c8725500ccb3dd2fa51a12b003d32073c4e
(cherry picked from commit 31473663f5
)
2022-06-30 19:12:07 +00:00
Joshua Mccloskey
93f79d6774
Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801
Change-Id: Ibf89a7a3b58f076d694e2582ffcd950f5cc54142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 19:06:42 +00:00