Bill Yi
e006e9823d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81a6f90e03513ab441888db3316d4b612b3a72ca
2022-06-11 13:17:41 -07:00
Bill Yi
77b66b7495
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id13eb722fe69d4c571cfa68c8fe1fa729e218a38
2022-06-11 13:07:25 -07:00
Bill Yi
5154fc5c35
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3654d12018957304a0bd3064d9950d284baaf332
2022-06-11 12:55:04 -07:00
Bill Yi
0157713d52
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8e4f48ee4f355af084d6a0edcb2d4172246a4a87
2022-06-11 12:49:13 -07:00
Bill Yi
154b913f4b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9332ed519d4fb2a15ad3ba9fcfea68d9ab657ff8
2022-06-10 21:47:08 -07:00
Bill Yi
f5cfec7f75
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e5a4af5147a8e1cdebd5049ad5941ce51442553
2022-06-10 21:43:26 -07:00
Evan Chen
61ea6782f5
Update AssociationIno creation for Bluetooth test
...
Bug: 189250370
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsCompanionAppsControllerTest
Change-Id: Iebbd2ca754b20d251f7a128bc2c460b4c3093762
Merged-In: Iebbd2ca754b20d251f7a128bc2c460b4c3093762
2022-06-10 23:03:33 +00:00
TreeHugger Robot
5f50ce04f1
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
am: 063e34e53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I03e4dcfe1a635099d1f13026d1d6a9d21b2348a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:31:05 +00:00
TreeHugger Robot
063e34e53c
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I48f417627a248636a9aecf0b3a25d9f0ce45eaa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:39:13 +00:00
TreeHugger Robot
1c45e9ad72
Merge "Update fingerprint removal dialog strings" into tm-dev
2022-06-10 20:09:03 +00:00
TreeHugger Robot
7fb0500aa8
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I14e635b309b81f636043f550e01e185c4839dd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:36 +00:00
TreeHugger Robot
3b2fe3e89e
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I11486349b04ce9af7004e6761e6d419e4892baf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 18:56:02 +00:00
Milton Wu
75d49b02bc
Merge "Update SUW fingerprint string" into tm-qpr-dev
2022-06-10 17:33:44 +00:00
TreeHugger Robot
fc45c25296
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev
2022-06-10 17:25:25 +00:00
Joshua Mccloskey
62db0f71bc
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 02f0255b7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I034b937a7e24f0af32f2f7371a0b0711dfa19bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:37:30 +00:00
Joshua Mccloskey
02f0255b7a
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I2424dc5d7377fd8f86f6d7d6c0dc14dfc274425d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:29:29 +00:00
Joshua Mccloskey
4d48d8266d
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: I12156eb5416d5e7a30454ccffe32d6bdbb248e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:29:13 +00:00
Joshua Mccloskey
52450aaa17
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev
2022-06-10 16:06:17 +00:00
Joshua Mccloskey
75313dcb5d
Merge "Updated FP enroll confirmation string" into tm-dev
2022-06-10 16:05:31 +00:00
TreeHugger Robot
05d57094a6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I83f149c01d1de95b08d8d5cf2c8e959a39dc1c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:04:31 +00:00
Bill Yi
0aa65938ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 6a5ff2d6a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I55d4f86e6d7479dad325069b495eee62ae4c0780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:04:28 +00:00
TreeHugger Robot
5bc97b815c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 1175da33ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I8091c5b7eff6c9186dc88875d8249e34ddb24839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:04:18 +00:00
Bill Yi
e64846d166
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: 5c0212eab6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I2abd5bb39947895fce5118ce8b81cab935712463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:04:06 +00:00
Bill Yi
b28b4c141b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I8d65e9d41d57ce5a80e617f3fad1a8f0e46f8507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:01:15 +00:00
Bill Yi
c6445438aa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 307f491327
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: Ia67488e5fccca13601c4dfafdd99d3c90c4140f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:01:00 +00:00
Bill Yi
ce611beecd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5648098e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: Idd9d2bd4d19477a608a818b8cd9e8fdb7f399831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:00:42 +00:00
Bill Yi
06ae56ce9d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d142ec9f58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: I73b7e54a94f037ca351413257b88eabeec506f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:00:33 +00:00
TreeHugger Robot
ee896b46e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: Icc79c0d0332a7e49d293cd5d7d1f34576ee3cd70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:51:21 +00:00
Bill Yi
6a5ff2d6a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I334022cc242a2dfa826e048ddf4b154f4a537a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:51:17 +00:00
TreeHugger Robot
1175da33ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I560d16ec38f46389b7a65e836fafd2b03011243d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:51:05 +00:00
Bill Yi
5c0212eab6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I901dc6475b628c6da28b36dbedece5bccc440b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:50:53 +00:00
Bill Yi
21559f3793
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-10 06:17:14 +00:00
Bill Yi
a5648098e2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-10 06:17:14 +00:00
TreeHugger Robot
2b662c5a07
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-10 06:08:45 +00:00
TreeHugger Robot
71826af4fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-10 06:08:45 +00:00
Jason Chiu
80f4582723
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
am: 4ec1953a82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I46c865b8c61b359254ea8e971c26b0faf09a8dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:51:11 +00:00
Jason Chiu
4ec1953a82
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Idf47ad68dd184cf45ce467eeb6be12a30e8c3057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:34:59 +00:00
Bill Yi
c1ebda67c2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b4ba2fd47b3ab2f58a1eb962a12872f85f224f4
2022-06-09 09:49:56 -07:00
Bill Yi
5391d591c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb0a9c21fb33588f13b99a46a30dd191e28d587b
2022-06-09 09:45:40 -07:00
Joshua Mccloskey
6947d508e8
Merge "Clear FP error only on progress." into tm-qpr-dev
2022-06-09 15:58:45 +00:00
Joshua Mccloskey
81224f09e3
Merge "Add functionality to restart fp enrollment." into tm-qpr-dev
2022-06-09 15:37:53 +00:00
Bill Yi
307f491327
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1c5638e6e3c3eef94aad83f3799058fe9043e77b
2022-06-09 07:35:45 -07:00
Bill Yi
d142ec9f58
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I45c392de92cbb27ed670cb70b657074d0ac762e1
2022-06-09 07:31:39 -07:00
Alan Huang
b9be27b006
[VolumePanel] Fix the Hearable control slice uri parameter
...
The provided uri doesn't contain the formatted string, so just append
the width at the end
Bug: 229048602
Test: make -j64 RunSettingsRoboTests
Change-Id: Idadbb4d725c8ca65bac31fbead8ac1d429ebcea9
2022-06-09 08:22:33 +00:00
Piotr Wilczyński
6dac1ca43d
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
am: 8bfab753c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: I74d279c286d697f13af2059e0c93f3c3109a7f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 08:19:37 +00:00
Jason Chiu
7f1ff1b796
Revert "Do not show the redundant RemoveAccountFailureDialog"
...
This reverts commit e5f1d24913
.
Reason for revert: "Remove account" does nothing and shows no errors
Fix: 232819214
Change-Id: I4a4e5084cde87ea2a9e5be1ff3ca6709e11ebc3d
2022-06-09 08:14:13 +00:00
Piotr Wilczyński
8bfab753c1
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: I00e339ffd5b02bcbfeccb512eeeedf6d6356df76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 07:59:40 +00:00
Piotr Wilczyński
7d634de3ea
Merge "Notify about brightness change when screen turns on" into tm-dev
2022-06-09 07:39:07 +00:00
TreeHugger Robot
2f544f0fd9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c
-s ours am: de2f136db2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801444
Change-Id: Ibc51d3174d2881c163b65034bae60db89b3f43d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:45:27 +00:00
Bill Yi
c9f3dc253e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863
-s ours am: ddb8e910fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801444
Change-Id: I386627ca41a418cc9e77cadb60aa6e7ef105555d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:45:22 +00:00