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
Joshua Mccloskey
c99fa169ca
Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev
2022-06-30 18:49:06 +00:00
Bill Yi
ac73a2f10f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I828baaa165b4b83e91890f75779f3d2681d81f88
2022-06-30 03:06:58 -07:00
Bill Yi
36728d9972
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5d207b4e02f4cec681b3182eb103058c2af54e27
2022-06-30 03:02:57 -07:00
Bill Yi
a140e645ff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib82da5ad9567b72f5a152893d397cafb736f0037
2022-06-30 02:54:36 -07:00
Bill Yi
d642b8754c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idaa60c0a1a599d60559c2610ffee17880bc5763b
2022-06-30 02:52:59 -07:00
Bill Yi
19777b98cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3e02d79532f2ccbde6d2f6716ba6991ab6945dd2
2022-06-30 02:51:14 -07:00
Bill Yi
3775e246dc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id0a25d2b31fee26b7f9ca2c9b45ed5128c064d00
2022-06-30 02:41:16 -07:00
Bill Yi
b107521284
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0fc17cde5466fe2346434ee2741d614c8c7fd2ba
2022-06-30 02:35:43 -07:00
Jason Chiu
60328e4308
[automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8
-s ours am: 08a312eeed
-s ours am: 919a67d253
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552
Change-Id: I785501cc24716f24a3fbb0c23483f3cb1fe234ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:21:36 +00:00
TreeHugger Robot
0e4e512d7b
Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59
am: 10c3e3e56f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069
Change-Id: I02ffa271a2896f481148b56558390c1b8f4fee88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:21:31 +00:00
Jason Chiu
919a67d253
[automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8
-s ours am: 08a312eeed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552
Change-Id: Ib8a0de0fd82916e3177ed6c5e7f58d44bead60aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:03:18 +00:00
TreeHugger Robot
10c3e3e56f
Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069
Change-Id: I36354f1a7511077a3499ff95e17992bdffb1f8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:03:13 +00:00
Jason Chiu
08a312eeed
[automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552
Change-Id: Ia464c9fba5ca19ef3af0c5b66546b955bfdc5f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:01:26 +00:00
TreeHugger Robot
526b870f59
Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev
2022-06-30 04:39:49 +00:00
Bill Yi
37a1fad359
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icf0a5a0e0f5c879e0dd77bd297cb0292ba19ef6e
2022-06-29 18:25:02 -07:00
Bill Yi
2cb8997657
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I47b4ad5429196a3a40323c5515b64b0889e60c67
2022-06-29 18:21:36 -07:00
Joshua McCloskey
69cc573b76
Add field to control margin in FaceEnrollIntro
...
Problem -> The require scroll mixin seems to scroll an entire device
length when a button click occurs. If you have page content
of 2x device_length + 10 pixels, a user will have to press the more
button twice to scroll this length. With the illustration_margin_bottom
field, devices can tune this parameter to allow the user to press
the more button once.
Fixes: 237474002
Test: Manual.
Change-Id: I9de2d74608260fe835870211a07b96249a8598f8
2022-06-29 19:07:44 +00:00
Joshua Mccloskey
e30a71787e
Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051
Change-Id: I4574d7014cfb6ca9050428e451654b9e8002995b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 17:12:05 +00:00
Joshua Mccloskey
431542dddc
Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev
2022-06-29 16:48:53 +00:00
Joshua McCloskey
cdb654f9be
Fixed unicorn multi-enrollment flow.
...
Test: Verified that Unicorn SUW flows can now
enroll a face.
Test: Verified normal SUW flow works as expected.
Fixes: 237088482
Fixes: 234663447
Change-Id: I9c4100f61b5e7d40fc9ed67c6918ec7bf31fc30a
2022-06-28 17:08:40 +00:00
Amy Hsu
6de8a405d7
Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521
Change-Id: Ia2572f07b47813095947d15d4665a378c1756f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 09:35:41 +00:00
Amy Hsu
d5279ceae3
Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev
2022-06-28 09:09:23 +00:00
SongFerng Wang
c150fe528d
Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766
Change-Id: I2e79ea4100840627a21bd8797c9f1875b09c9161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 06:20:37 +00:00
SongFerng Wang
602fe375d9
Merge "Fix the testcase error" into tm-d1-dev
2022-06-28 05:57:21 +00:00
Amy Hsu
088a212a35
[RRS] Avoid the resolution switch too rapidly.
...
Make sure previous setting has been completed before we set current
resolution. Register a display listner to listen onDisplayChanged
callback. So that we can know when display resolution change completed.
Bug: 232440665
Test: Switch resolution quickly and check display situation.
Change-Id: I1460c1db191250d8e51dd639cd969e4323f71abd
2022-06-28 01:41:24 +08:00
SongFerngWang
cefad1e4b7
Fix the testcase error
...
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.
Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
2022-06-27 20:42:31 +08:00
SongFerng Wang
0018589f09
Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989
Change-Id: I43380dd3e84f63925c494038f9bb1c84207f2faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-26 17:02:16 +00:00