Weng Su
d487a5f38d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours
...
am skip reason: Merged-In I5cf984000244b4ad901c6a4977a1368279323e0a with SHA-1 8c6c1ca236
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I1f3a68c7b237832351a3b87a704a1095340fa9d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:44:20 +00:00
Treehugger Robot
93a00c4ef1
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Id980174e50aca77c67f3d0d9dd49090cd91c490f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:05:26 +00:00
Weng Su
2fe8201d4d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ia0f50301822f13097d1ca5bf02ca1468a8f499d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:05:24 +00:00
Treehugger Robot
96647238d2
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I5c02052cea553a59440c7b190b5cadd6ae437c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:05:10 +00:00
Weng Su
ce242730ed
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I4dd74a47a6214f98a59e247b6f2727fa7c19098b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:05:08 +00:00
Treehugger Robot
b48dfbbe86
Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: Ia55ca6e477494e1e0ca3773c7a4df63ca2d59d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:04:58 +00:00
Treehugger Robot
fcdfbfcec6
Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: I78354926e77df23701e883191bcb36330e2a483d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:04:45 +00:00
Weng Su
ae5606811f
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours
...
am skip reason: Merged-In I5cf984000244b4ad901c6a4977a1368279323e0a with SHA-1 8c6c1ca236
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: Ie6719f8ad85070e094ab685d16c65579cbc006b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:02:22 +00:00
Treehugger Robot
1ad564b9b9
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ia54e445885861ee810783414d67cf33074212339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:40 +00:00
Weng Su
5bc1b45a85
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I215f6bc431796c15ab3a71aed5d9894ea6050f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:38 +00:00
Weng Su
995a7a4b71
[RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I6730a2d19a398f2ae6fe585c617d9713205139a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:19 +00:00
Treehugger Robot
57b00e28ea
Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: Ic052e568818d4829fe40250e00679742fc816263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:59:46 +00:00
Treehugger Robot
a364f6475a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I657080d670e7149418757a7311b339d0d104863f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:35:29 +00:00
Weng Su
82c89c8ef7
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ic98d995f5949fd3cd19d5193afd17bb67f68d579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:35:23 +00:00
Wenhui Yang
d26f18f727
Revert "Fix rotate device at face unlock detailed page, device will display"
...
This reverts commit 2ca753bd06
.
Reason for revert: Fix b/289173795
Change-Id: Ieaabe550bcbaad21a2373f3c5c103c68739d45dc
2023-07-25 20:31:36 +00:00
Treehugger Robot
64c88a192a
Merge "Restrict ApnEditor settings" into udc-dev
2023-07-25 20:09:39 +00:00
Treehugger Robot
a88e1b6c73
Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev
2023-07-25 19:48:14 +00:00
Treehugger Robot
5a5184ab27
Merge "Fix test in RemoteVolumeGroupControllerTest" into main
2023-07-25 15:06:57 +00:00
Iván Budnik
dd6ee00476
Fix test in RemoteVolumeGroupControllerTest
...
The failure was caused by ag/24081083.
Bug: 292920056
Bug: 192657812
Test: atest RemoteVolumeGroupControllerTest
Change-Id: Iac59b69dd49b4873a72081ae5776fc2f451bbb10
2023-07-25 13:48:12 +00:00
Milton Wu
acb8be5d25
[BiometricsV2] Refactor AutoCredentialViewModel
...
Refactor AutoCredentialViewModelTest and FingerprintEnrollmentViewModel
to kotlin and change LiveData to Flow
Bug: 286197659
Test: atest -m CredentialModelTest
Test: atest -m AutoCredentialViewModelTest
Test: atest -m FingerprintEnrollmentViewModelTest
Test: atest -m FingerprintEnrollmentActivityTest
Test: atest -m biometrics-enrollment-test
Change-Id: I84bab0b46e023303c0046a6ae6886ab1cf9458b8
2023-07-25 21:14:42 +08:00
Milton Wu
04b600d0d8
[BiometricsV2] Refine ErrorDialogViewModelTest
...
Some FingerprintEnrollErrorDialogViewModel APIs related coroutine don't
be well test in FingerprintEnrollErrorDialogViewModelTest
Bug: 293044262
Test: atest -m FingerprintEnrollErrorDialogViewModelTest
Change-Id: Iab3897d37c904184c1f58ab617e74cd563b3aa43
2023-07-25 13:02:02 +00:00
Bill Lin
41e2f9c1c0
Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev am: c8eb80bcc2
am: f71d183d0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24175645
Change-Id: Ice5e79a72872009b5f1f90faf8bf9b02854c40d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 02:40:33 +00:00
Bill Lin
f71d183d0b
Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev am: c8eb80bcc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24175645
Change-Id: If919e1da98abb430b7d6c79211139c6f2a1e4f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 01:57:48 +00:00
Cassie Wang
75842520d2
Add a config to show the Vpn options menu.
...
Bug: 290124499
Test: m -j32 Settings
Change-Id: I14d59b656e917f6fb7a495f14297c594a115c018
2023-07-25 10:31:45 +09:00
Bill Lin
c8eb80bcc2
Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev
2023-07-25 01:30:28 +00:00
Automerger Merge Worker
78f3760d26
Merge changes from topic "am-f755b8c24ad94702890f1d42d43459e9" into udc-qpr-dev-plus-aosp am: aa25f927b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: Id13d948f53e5ed006a92025b28167df586a8ae08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:50:47 +00:00
Treehugger Robot
be03940ae6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c
-s ours am: a439e611f9
-s ours am: 23b2daac94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I4f5621fe2ddcc5210f4945abe8b88c9420c9604f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:50:32 +00:00
Treehugger Robot
392bab04a1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c
-s ours am: fcea32c091
-s ours am: 52ffe43752
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: Ib22fcf9b55dfa81b08125d8db28e0bfaa2e2cc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:43:36 +00:00
Bill Yi
01a62cf373
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7
-s ours am: f59718d27d
-s ours am: 5309e5726d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I88df26646807f3f96b68a58672da7f111bed78b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:43:26 +00:00
Bill Yi
1f46346431
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c
-s ours am: 6f38faac18
-s ours am: 81829e623d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: I353239b2706d5b911ec5f671e44ed38b1b69718a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:43:11 +00:00
Automerger Merge Worker
aa25f927b3
Merge changes from topic "am-f755b8c24ad94702890f1d42d43459e9" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c
-s ours am: a439e611f9
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7
-s ours am: 7db67a8851
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c
-s ours am: 93b217da0f
-s ours
2023-07-24 20:56:20 +00:00
Treehugger Robot
23b2daac94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c
-s ours am: a439e611f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I55fb1a3666b69fd469866dc2aaa23af4ada6d628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:54:30 +00:00
Bill Yi
56f20a8956
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7
-s ours am: 7db67a8851
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I28cebef2eab44987bc2d2224137f5407a4d4139a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:54:28 +00:00
Bill Yi
35a9d7e192
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c
-s ours am: 93b217da0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: I24aad12367aeaa688215c679c78ffef0660e03ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:54:04 +00:00
Treehugger Robot
52ffe43752
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c
-s ours am: fcea32c091
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I424b430c656f5f0e5606d2983d6d14ac6de44d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:50:07 +00:00
Bill Yi
5309e5726d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7
-s ours am: f59718d27d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I73f116475fd5295e7c0c9438b0502c8051746fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:49:57 +00:00
Bill Yi
81829e623d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c
-s ours am: 6f38faac18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: I8ca6e698c0a408f58648dcbeda3ffdf479f7e685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:49:43 +00:00
Treehugger Robot
fcea32c091
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: If5ea1b183887a10024983c03994ed945de3ab5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:31:48 +00:00
Bill Yi
f59718d27d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: Ia68b58c9935fe4425f4aa06e6d37d401d0c8d7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:31:33 +00:00
Bill Yi
6f38faac18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: I3d6bb56c0a4356d063a2a9db0bf6a6eb2ad15a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:31:30 +00:00
Treehugger Robot
a439e611f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I9d69d8978d412140ecf37fc0c96756ad12f95f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:30:12 +00:00
Bill Yi
7db67a8851
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I6998be11d631b1a584327e477f690ef8c52b2182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:30:07 +00:00
Bill Yi
93b217da0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: Ieaa0b92c521914293cd766388890f3b46eb574e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:29:48 +00:00
Treehugger Robot
1a073f4f6c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-24 19:18:34 +00:00
Bill Yi
0b179a9a1c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If5cf9ebde62e0be58cacf65575d45f79c5cc1a79
2023-07-24 09:23:04 -07:00
Bill Yi
47855826c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1927131129b72df309406cf5dfe3a37b7d94e71c
2023-07-24 09:20:40 -07:00
Tetiana Meronyk
6b27c08150
Fix keyboard showing after dialog dismissed
...
When dialog for creating user was dismissed with keyboard being displayed, the keyboard stayed on the screen and could not be released due to incorrect list of methods called on dialog dismissal. This CL topic fixes onDismiss() behaviour of this dialog. Videos of current behaviour and behaviour after fixed are attached to the bug.
Bug: 291865725
Test: atest UserSettingsTest
Change-Id: Ib3ade3de9228c8ba24e7ac2e235aaeec45efbe4e
2023-07-24 10:30:32 +00:00
lbill
a851e68272
Fix no vibration when enroll init stage after receive onEnrollmentHelp
...
Change the behavior of vibration when
1. Init stage, don't vibrate if onEnrollmentHelp invoke
2. Then next enroll progress update, should vibrate
Note: This onEnrollmentHelp is invoked by FINGERPRINT_ACQUIRED_PARTIAL
Test: Should vibration when the progress 1st indicating after lightly press
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 290723009
Change-Id: Ie056aac8b3251fb3da6dccd95254fb30628fa65e
2023-07-24 07:23:12 +00:00
Charlotte Lu
9d961b01ab
Merge "Button text to turn off the sim" into main
2023-07-24 05:01:43 +00:00
Treehugger Robot
63997b38d7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90d628186c
-s ours am: b6d9a8bca0
-s ours am: 677dddc207
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: I120b9dff249714ed1ee15d27d611def8bb74e836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 04:00:14 +00:00