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
TreeHugger Robot
495824f000
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f
-s ours am: 8c54572db8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801440
Change-Id: I938d8b32df6df00b62ecb99e57382d4228b66018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:45:11 +00:00
Bill Yi
2b3c76edef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c
-s ours am: 7e372d0d7b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801440
Change-Id: I8aa035cca665c4c484a107260d67002e76a1c069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:45:03 +00:00
TreeHugger Robot
de2f136db2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c
-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: I4d20b340b1e2c99600d9f65be2a9dd4d39665065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:03:12 +00:00
Bill Yi
ddb8e910fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863
-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: I3283a18c41f6831e88aba3e47c2f3b8f1f94c2e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:03:08 +00:00
TreeHugger Robot
8c54572db8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801440
Change-Id: I83eb11ff5ef39ab26f20b32ec86a0d5ab88b8995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:02:58 +00:00
Bill Yi
7e372d0d7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801440
Change-Id: I63dc3cd8206c7addf7ff7497b0d26f0fd4e3bdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 03:02:47 +00:00
SongFerng Wang
cac60c3548
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
am: 8425062cef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: Iaf160129453409905112ff321ab35694c3383b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:42:56 +00:00
SongFerngWang
d581334f58
[Setting crash] The dialog is null am: 8514ff65eb
am: c69ee75a64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Iba704f625707a2eb9e6ae90f648ce335c9201e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:42:49 +00:00
TreeHugger Robot
f700b7398c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-09 02:39:03 +00:00
TreeHugger Robot
8be819762f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-09 02:39:03 +00:00
SongFerng Wang
8425062cef
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: Ic113ffc982f64c332b5269275e47941d6d5c2245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:07:10 +00:00
SongFerngWang
c69ee75a64
[Setting crash] The dialog is null am: 8514ff65eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Ib697f1fddcb8b77b36d2dc95cfa34331ded9bf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:06:56 +00:00
SongFerng Wang
be1b37ae2b
Merge "Unable to enable the removable esim" into tm-dev
2022-06-09 01:30:44 +00:00
Weng Su
5f421125ab
Restrict WifiSlice functionality for guest user
...
- Hide Wi-Fi toggle and show Wi-Fi status only if the user is a guest.
Bug: 232798363
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest
Change-Id: I35418477808eb5082f4651f5689f018dbb8e42ac
2022-06-09 06:07:55 +08:00
Joshua McCloskey
0eb278b245
Added consent message for FaceAuth enrollment.
...
Test: Manual.
Fixes: 234663447
Change-Id: Iefd9b10eb634ed271f57b82e2a40be08dbbc1f61
2022-06-08 22:02:19 +00:00
Bill Yi
d98e536863
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I650e4197e0aff594a172c01f04cffd4092b7467d
2022-06-08 14:12:47 -07:00
Bill Yi
fe71b2e76c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4111bd9a5feee6d6a8b5db7861d622ea893515e2
2022-06-08 14:08:50 -07:00
Joshua McCloskey
548f6f36c1
Add functionality to restart fp enrollment.
...
Test: Tested manually via SUW that restarting enrollment works
as expected.
Test: Tested manually via settings that restarting enrollment
works as expected.
Fixes: 234887288
Change-Id: I815392269da786d2dfd157267919a09281af6277
2022-06-08 21:00:59 +00:00
Joshua McCloskey
77452db3f9
Updated FP enroll confirmation string
...
Test: Verified correct string shows after FP enrollment.
Fixes: 234183906
Change-Id: I57e7ce836d4dc5ad2caf198aa59738f64dc4c049
2022-06-08 20:59:36 +00:00
SongFerngWang
8514ff65eb
[Setting crash] The dialog is null
...
Add the null protection.
Bug: 235267673
Test: build pass
Change-Id: Ib9308d152ddc233354d89166b8d79fcec81d8c19
2022-06-08 08:32:05 +00:00
Milton Wu
2069d2e17b
Update SUW fingerprint string
...
Bug: 228021544
Test: Check string in SUW flow
Change-Id: Id0729b7f2758e98d53484ffd35282c6423f82262
2022-06-08 07:12:24 +00:00
Avinash Vadlamudi
26e3744221
Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev
...
* changes:
Rename method for better readability
Fix the Ephemeral guest mode UI bugs
2022-06-08 04:03:11 +00:00
Bill Yi
c4a1f97025
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours am: 537b47d74e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Ic7cf3d05fe64e8e19bfc950365e3d210155a76dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:48:30 +00:00