TreeHugger Robot
c0dc5f7598
[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: Ib4c6a570fc509e577fbecbcfc855f84b93a19c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 23:06:00 +00:00
Bill Yi
066686f5a9
[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: I9c6d3c6f3cfa756204edbb4a386dc3d3526e531b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 23:05:48 +00:00
TreeHugger Robot
54e6e890c8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9
-s ours am: de76b7c0c0
-s ours am: 763c57727e
-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: I125741f0bd2432eaac7f1cc810a2439a5b9017ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:57:59 +00:00
Bill Yi
6456bec4e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359
-s ours am: e725f74df6
-s ours am: 7ce77f731d
-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: I07231d644c2d798be3cd458e624ff02a390bfbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:57:55 +00:00
TreeHugger Robot
f4817f1097
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d
-s ours am: eb1fac17dd
-s ours am: f76d513bac
-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: Ia53713a7e2bd721b10f1ce6a2724456b40855d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:57:42 +00:00
Bill Yi
9d1a4bed68
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657
-s ours am: 26aaae4b33
-s ours am: 1e7ec9488d
-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: I3e53894de90192507042738ec046e0db047b7525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:57:30 +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
763c57727e
[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: Ia4ee7e4ef6b3a1a8abe5b1b0b91c1b9d45cb69bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:36:16 +00:00
Bill Yi
7ce77f731d
[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: I2d1fed1764f95efa440204ca2ba4b49d1e95d4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:36:14 +00:00
TreeHugger Robot
f76d513bac
[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: Ia24aa647669b45543c89a0ff544208c56fd5fbd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:36:04 +00:00
Bill Yi
1e7ec9488d
[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: I3f144c74d50937adb49ba867bfbbeda127a5e1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 22:35:47 +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
c45744b895
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: I85ffc3d2738d7398b261c48f27cf29c84c328f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 19:06:54 +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
Jason Chiu
bbd4ba6097
[automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8
-s ours am: 08a312eeed
-s ours am: fd87b73bce
-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: I3876504245474d277f00335301cbbd3d8c98b11a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:21:51 +00:00
TreeHugger Robot
d7d9010c66
Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59
am: 95dd3a91fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069
Change-Id: I5d747db63465740453e8f970006cfb70c605b2e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:21:45 +00:00
Jason Chiu
0a32801a7f
[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: Id618e4458a951d98ef0b76384aba09012f402cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:21:40 +00:00
TreeHugger Robot
2da3d922d5
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: I656847a34246a43506198d2d5a8c9cd6cbb34af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:21:33 +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
fd87b73bce
[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: I3efcde0abdece1f1591e14df6ccc11a54f39803d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:01:53 +00:00
TreeHugger Robot
95dd3a91fc
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: Ib52f8a818aa6601d6e5c0b7e0b0a64e98c85feea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 05:01:47 +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
Xin Li
75f92deb34
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355
-s ours am: 5c022ddef7
-s ours
...
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093059
Change-Id: I2e9dc310e15431b643c709b99507f6f8b045aae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 22:56:48 +00:00
Xin Li
5c022ddef7
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355
-s ours
...
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093059
Change-Id: I9e74383c3f36d139ef3a2838d937532fa55cd6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 22:13:18 +00: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
70a6062446
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: If3bf0ca501d6a5bb460fa0ab05ae39239f34720e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 17:12:08 +00:00
Joshua Mccloskey
431542dddc
Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev
2022-06-29 16:48:53 +00:00
Xin Li
b8d6e73355
Merge tm-dev-plus-aosp-without-vendor@8763363
...
Bug: 236760014
Merged-In: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
Change-Id: I9d69bcbc6916176beece2616f152ebd3d74fc0f8
2022-06-28 21:23:28 +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
SongFerng Wang
96aca02753
[automerger skipped] Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8
am: 2225b7058b
am: f0973dfa33
-s ours
...
am skip reason: Merged-In Idb746e42480f99846efb5d1e4d4a411a5a9ca296 with SHA-1 cefad1e4b7
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453
Change-Id: I7fe8794b536147a489e9689fb174d9435695703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 12:08:51 +00:00
SongFerngWang
9f1ce23550
[automerger skipped] The UI only shows the active LE device am: 7f6fcce1d5
am: 787a0e0249
am: 7c173b36f8
-s ours
...
am skip reason: Merged-In Iac661206def4d43bc40ab9bb1938f084926899c2 with SHA-1 6426382e90
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452
Change-Id: I59e3dc774cd97748239407b1f89374dfd09e9827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 12:08:47 +00:00
SongFerng Wang
f0973dfa33
Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8
am: 2225b7058b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453
Change-Id: Iecbe5647bbe469a0239b594692f66c0226e16df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 11:45:09 +00:00
SongFerngWang
7c173b36f8
The UI only shows the active LE device am: 7f6fcce1d5
am: 787a0e0249
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452
Change-Id: I6e57db85b4d10586d111e39dcd7ee77e67fd9d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 11:45:05 +00:00
SongFerng Wang
2225b7058b
Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453
Change-Id: I45a7c8fd77798a873db7ea10683b861ee83b8622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 10:10:23 +00:00
SongFerngWang
787a0e0249
The UI only shows the active LE device am: 7f6fcce1d5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452
Change-Id: I19dc6c505e7ec9824cf520824ea1ed2d9dcfc196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 10:10:22 +00:00
Amy Hsu
414d2bf243
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: I7adc73353a1674fd950ef211cedc857da1d235c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 09:35:42 +00:00
SongFerng Wang
e27d1790f8
Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox"
...
* changes:
Fix the testcase error
The UI only shows the active LE device
2022-06-28 09:27:02 +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
SongFerngWang
30a312975c
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
Merged-In: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
2022-06-28 15:18:39 +08:00
SongFerngWang
7f6fcce1d5
The UI only shows the active LE device
...
At the media device, it only shows the active LE device which is
connected.
Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
Merged-In: Iac661206def4d43bc40ab9bb1938f084926899c2
2022-06-28 15:03:07 +08:00