TreeHugger Robot
f2e5977255
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-07-01 00:34: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
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
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
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
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
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
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
d5279ceae3
Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev
2022-06-28 09:09:23 +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
dc72a4a14f
Merge "The UI only shows the active LE device" into tm-d1-dev
2022-06-26 16:38:24 +00:00
Jason Chiu
846d0286a8
[DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow
...
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.
Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.
Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
2022-06-24 08:21:34 +00:00
Jason Chiu
5df14831b8
Make bluetooth not discoverable via large screen deep link flow
...
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.
Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.
Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
2022-06-24 08:16:41 +00:00
TreeHugger Robot
3c670f625b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236
Change-Id: I47acf265f965f1c11d120fda0dfc7e6722d92996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 06:23:40 +00:00
Bill Yi
1b6e655273
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236
Change-Id: I1d799cd34b481248a08d8370ef17487ec6869336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 06:23:30 +00:00
TreeHugger Robot
70e38435d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235
Change-Id: I052397307c2e612c044e56f4635ec91df71fead9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 06:23:15 +00:00
Bill Yi
e780500266
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235
Change-Id: Id695b1fd9d940d8682fb7b7835270dac9fd2ca54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 06:23:03 +00:00
TreeHugger Robot
91d1b5cc61
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-24 05:55:42 +00:00
TreeHugger Robot
8b49ce00c2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-24 05:55:42 +00:00
Bill Yi
fcf5908f6e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7
-s ours am: 9e020b5dc5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983537
Change-Id: Ic8aa57adff7e1037938d00ff65ef1e66a985e72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:42:36 +00:00
Bill Yi
9e020b5dc5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983537
Change-Id: I4d52aed366853fdd6d49e08834224a4c1328e9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:33:58 +00:00
TreeHugger Robot
886b1ed6c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50
-s ours am: 2d21dce94b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819
Change-Id: I53f1fdfeebd1b931481610b5d4c47c879a472950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:33:08 +00:00
Bill Yi
914aa7d423
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35
-s ours am: b716d79126
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819
Change-Id: I68918c514fa91015b8cee9915ba253c9d0f5aa32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:32:58 +00:00
Bill Yi
29bb5a7941
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52
-s ours am: 7f9fa7fedb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856818
Change-Id: If79f019dc6606c2160f81801d26d1caf604b4f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:32:48 +00:00
TreeHugger Robot
2d21dce94b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819
Change-Id: Ia9c9c5f80f081bbc46f2d9584da1de779dd8a19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:26:08 +00:00
Bill Yi
b716d79126
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819
Change-Id: I5e5678837487f60f7bdbd9685637048f582b4079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:25:59 +00:00
Bill Yi
7f9fa7fedb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856818
Change-Id: Ie0a4aa6df5b5a9e09080d679dae93f7221f75617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:25:48 +00:00