Treehugger Robot
82024a7805
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: afc1826562
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672365
Change-Id: I3e6683bf77bdf0dbe19da684d2aaab7592467afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 17:43:05 +00:00
Bill Yi
e5d0d9712c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c20a28a88
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672365
Change-Id: I8c1603170339a9ccfb4f625dd4951c16f6f58fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 17:42:55 +00:00
Treehugger Robot
afc1826562
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-06-13 17:23:18 +00:00
Grace Cheng
2365ad895a
Fix NPE in updateAddPreference
...
Update mAddFingerprintPreference to avoid NPE
Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 16:52:51 +00:00
Treehugger Robot
3be80721d3
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-qpr-dev am: e5ebbd4ef1
am: 375736a156
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545061
Change-Id: I6473f972418279a7363c2d2e833233b7e760254e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 14:56:04 +00:00
Taran Singh
ee812bf50e
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 45e2c72877
am: 24d2af03ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545061
Change-Id: I72888efe4fb55b0df05d19b85df787cf98e914f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 14:55:59 +00:00
Treehugger Robot
375736a156
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-qpr-dev am: e5ebbd4ef1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545061
Change-Id: I84a25bcf3b49af25aebf8e939dbc5e3e39e701b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 13:54:28 +00:00
Taran Singh
24d2af03ad
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 45e2c72877
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545061
Change-Id: Ie949ff50de3320bc254df90a672bbdc0ae976663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 13:54:24 +00:00
Treehugger Robot
e5ebbd4ef1
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-qpr-dev
2023-06-13 13:20:09 +00:00
Milton Wu
aadecbaf34
[BiometricsV2] Refactor model code to kotlin
...
Bug: 286196884
Test: atest FingerprintEnrollmentActivityTest CredentialModelTest
EnrollmentRequestTest FingerprintEnrollIntroViewModelTest
FingerprintEnrollmentViewModelTest
Test: atest biometrics-enrollment-test
Change-Id: I2bdae4d2dd052d3664a790cd982edf51fcebec09
2023-06-13 10:29:16 +00:00
Milton Wu
78e0f9de8a
[BiometricsV2] Fix fingerprintSettings not shown
...
Fix "Fingerprint Unlock" page not show when 1st fingerprint is added
through biometrics v2 enrollment on a device w/ faceunlock
Do no check bundle is null or not during check activity result because
it may be null if callee activity doesn't need to pass anything back to
previous caller activity.
Bug: 286993437
Test: test this scenario on a fingerprint only device w/o v2
Test: test this scenario on a faceunlock device w/o v2
Test: test this scenario on a fingerprint only device w/ v2
Test: test this scenario on a faceunlock device w/ v2
Change-Id: Ic6168e73de378ecc1555808d4f0969f4c490a38d
2023-06-13 17:55:49 +08:00
Tetiana Meronyk
eaf7b260e0
Merge "Remove unused parameter from createDialog method in User Info edit dialog" into udc-qpr-dev am: 38b627b69c
am: 3ada1f3da8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23475256
Change-Id: Ieed3ae425ace8b2663829089c7517763e45bdc78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 09:44:10 +00:00
tom hsu
c5191197fd
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
am: 5c5a39adbe
am: 4489840fec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: I502feebf5a9556a4457b35f3335565322ccde3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 09:44:01 +00:00
tom hsu
34f3320955
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
am: e21d27c5ef
am: d09cfbeb05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: I2a27d2a8f9ff3e7736aaa24bca095a9c86da0b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 09:43:52 +00:00
Tetiana Meronyk
3ada1f3da8
Merge "Remove unused parameter from createDialog method in User Info edit dialog" into udc-qpr-dev am: 38b627b69c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23475256
Change-Id: I1be256ff509008bbd0270a7758c14dd1d8413723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 09:42:07 +00:00
tom hsu
4489840fec
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
am: 5c5a39adbe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: I297134f81a1a148d06decd50b155a9333c5946fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 09:41:46 +00:00
Tetiana Meronyk
38b627b69c
Merge "Remove unused parameter from createDialog method in User Info edit dialog" into udc-qpr-dev
2023-06-13 09:36:23 +00:00
tom hsu
d09cfbeb05
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
am: e21d27c5ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: I9ad25617fc2d6142c8455be78ac8118799ab505f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 09:36:12 +00:00
tom hsu
5c5a39adbe
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: Id741c5c75d5982da0ceae3ceef767858e2bcf462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 08:58:46 +00:00
tom hsu
e21d27c5ef
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: I61dc41ada82f1fbcba4c1b337681ebd3e4b47055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 08:54:36 +00:00
Bill Yi
b6f09ef6f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c435ac955d620aab019dd17088118e814dbec4e
2023-06-13 01:10:34 -07:00
Bill Yi
12997b410b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I739e498f185080ffca9e53e9d27e8274cd8d3658
2023-06-13 01:09:17 -07:00
Bill Yi
c1407e61f1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If3945f0ac9f4368b2cd50e66554accadc49e31ed
2023-06-13 01:00:54 -07:00
Bill Yi
1b3fa16402
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0491470fdf46e7b84b67fc3b8c10ba02af05b25d
2023-06-13 00:58:29 -07:00
Bill Yi
8430cda6d3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I85702c2b4ddd2485683d5bb16bed43244e70022b
2023-06-13 00:56:19 -07:00
Bill Yi
daea733ce1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I71ab2f9c50e9d2c3af6f9005a69e01271e8ef2cc
2023-06-13 00:55:08 -07:00
Bill Yi
aa3e86a4f1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifec4827871d0180c64e68f614fe5e5dad5a3196a
2023-06-13 00:52:33 -07:00
Bill Yi
5c20a28a88
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2195b6922ed0862d1c5fe242f05a798ed470590c
2023-06-13 00:50:22 -07:00
SongFerngWang
f405dadcf2
Remove the owner
...
Bug: 286964921
Test: build pass
Change-Id: I4daf629e8cb994753dca36a811f0d25685df6928
2023-06-13 15:10:46 +08:00
tom hsu
5216eeaaec
[Settings] Fix MMS message UI is no consistency between UI and real state.
...
Bug: 285253872
Bug: 281566495
Test: Manual test passed.
Change-Id: I805490fd5c4417e88c38a047f99ef626c16f600a
2023-06-13 06:01:25 +00:00
Rhed Jao
1c7c01adb8
Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev am: cc1fe61339
am: 6856e809b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308384
Change-Id: I4e688e2034b1d33b141fb13a5383b7142b743901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 03:00:36 +00:00
Wenhui Yang
52d5bdc0c1
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb316
am: 9ed0cee15f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23574345
Change-Id: Ib9580f0420fc4bd0de6b06234294af5c2feb8e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 02:59:29 +00:00
Wenhui Yang
4e059e6f4b
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev am: 14b115177c
am: afa7bcb2e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23591204
Change-Id: I953acbc10670453878669fc3912c98bba4850470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 02:57:50 +00:00
Rhed Jao
6856e809b0
Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev am: cc1fe61339
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308384
Change-Id: I8042bcbec114798b9fee18b76733944f99bd8c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 02:55:54 +00:00
Chaohui Wang
966f72c4c3
Clean up Settings_srcs & Settings_manifest
...
Bug: 286764889
Test: m Settings
Change-Id: I13510f58554cd2a53f4f1e0d63cc63623c576bf2
2023-06-13 02:16:23 +00:00
Rhed Jao
cc1fe61339
Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev
2023-06-13 02:14:22 +00:00
Wenhui Yang
9ed0cee15f
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23574345
Change-Id: I1d258a5f739e9ed033bce431e6ea636f3772910a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 01:49:53 +00:00
Wenhui Yang
afa7bcb2e5
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev am: 14b115177c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23591204
Change-Id: I6b745a87a4a20ca01bb55cc0a5e921c12f1fcc23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 01:48:41 +00:00
Wenhui Yang
bfa2feb316
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev
2023-06-13 01:02:42 +00:00
Wenhui Yang
14b115177c
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev
2023-06-13 01:02:08 +00:00
Treehugger Robot
c817df185e
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
am: fcea84c01a
am: 62d4693a35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I609433f0a68a61a91ddeaa3ffb7d8a8d5cf0fbe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:49:21 +00:00
Taran Singh
79e93643e5
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
am: 7e1d083e05
am: 27d2496143
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I89463761e9fa2bf9a03bd4a31c3ca810e066c4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:49:18 +00:00
Treehugger Robot
3fa27c1b83
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: c823f0aa45
am: ec895b0869
am: 9799773023
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I95a1b4d979185a68d2fbc018841ecc4ac01eda16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:46:15 +00:00
Taran Singh
2507c1bf9f
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 6f6747910d
am: 9a3cabaa42
am: 22fd06cac9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I52b6d3de0435422a8c6a983ecf8edd1d0b01aaa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:46:13 +00:00
Treehugger Robot
f13901b9c3
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
am: dd37c26472
am: 2cc6bd304c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I27b45018eb9f4ca0095f8e42983040f1a67277cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:45:05 +00:00
Taran Singh
efa54fce9c
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
am: 6484a7f640
am: 5552c412c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Ia0da2f8e129d942ef638929f650d18cc610c95cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:44:59 +00:00
Treehugger Robot
62d4693a35
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
am: fcea84c01a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Ia3b3f1ffeeaa6fd955098f15f1115bfb723e8b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:03:59 +00:00
Taran Singh
27d2496143
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
am: 7e1d083e05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I3425e53e13281e35d148be5395042bd57d4ec4e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:03:57 +00:00
Treehugger Robot
9799773023
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: c823f0aa45
am: ec895b0869
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I6374a07f77b537042132b1b6bbd9c8e482efacea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:01:47 +00:00
Taran Singh
22fd06cac9
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 6f6747910d
am: 9a3cabaa42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I314e70b2fec41d0326da7ab246eccd501e2a14ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:01:46 +00:00