Bill Yi
5cce83d64d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: a20c952bb6 -s ours am: 7c411855f0 -s ours am: bd7089ca70 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I5b9db03de88b255df7787531544cb656222aca00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:53:44 +00:00
Bill Yi
27c2686060
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: 60f3e2d53d -s ours am: 0aafcc81f4 -s ours am: 2d9af65f5f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Ia1ded13e06d2e1279f3a777cde3175724092d273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:53:25 +00:00
Wenhui Yang
d56f96aaba
Merge "Fix face model delete message" into udc-d1-dev
2023-06-13 20:43:42 +00:00
Grace Cheng
2d5f43d7e3
Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c am: f0614ef722
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674
Change-Id: Icb68998721d53d5adbbbfe361b22361037e101e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:31:17 +00:00
Bill Yi
9352e1c2dc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: 32b73cd4ea -s ours am: fec819220b -s ours am: 25683d53c4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Ib551887d4824182562d52b9be25e07310d2803b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:29:18 +00:00
Bill Yi
f1566e9a2d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: d152123a74 -s ours am: c0c0c7cf5c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I2b3eb103b3247c6fb965f2f5c18c7c61f6c51a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:17:45 +00:00
Bill Yi
0ddf5f1eaf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: a8cf863944 -s ours am: 88d7f8f441 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I77a4ac57a14849c5e2c0da355b11fb90d4cc831a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:16:12 +00:00
Bill Yi
bd7089ca70
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: a20c952bb6 -s ours am: 7c411855f0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I525760d413e9a941cb578da0586084c62b19d8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:15:55 +00:00
Bill Yi
2d9af65f5f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: 60f3e2d53d -s ours am: 0aafcc81f4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I449caac98a9aeb2423139d8b35567760aeff0b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:15:39 +00:00
Treehugger Robot
f6b552a956
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 5004aa4057 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672366
Change-Id: I1bc55ef001f55ae46f3c0dee0a0ae85832cc4009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:02:09 +00:00
Bill Yi
12ee41ee01
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa3e86a4f1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672366
Change-Id: I8094d3bfcf2d9cacba7763bbcde64fd7a1bc599e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:01:46 +00:00
Grace Cheng
f0614ef722
Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674
Change-Id: I6332c141e3bb13b49bbabfcfebc3e91b8a5faf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:01:00 +00:00
TreeHugger Robot
f2f899106d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
TreeHugger Robot
3b89844e7f
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
TreeHugger Robot
6fd46cf3a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
Treehugger Robot
5004aa4057
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-06-13 19:27:07 +00:00
Grace Cheng
f58714496a
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
Merged-In: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 19:23:04 +00:00
Grace Cheng
8ba960014c
Merge "Fix NPE in updateAddPreference" into udc-d1-dev
2023-06-13 19:22:55 +00:00
Bill Yi
25683d53c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: 32b73cd4ea -s ours am: fec819220b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I42f065234404c9ef6a5379172eb3be8ac5f51d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 19:00:10 +00:00
Automerger Merge Worker
6efe6f7549
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: 71c6887a4a -s ours"
2023-06-13 18:59:35 +00:00
Bill Yi
59fc202c18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: 71c6887a4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I1dbf45a8e10ee7eb14bf1b8d2cc50da6483b3abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:59:01 +00:00
Bill Yi
06e1524146
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: 3c06cd86dd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I284e07390c1dce41b93e604696eb2486b952bd3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:58:32 +00:00
Bill Yi
c0c0c7cf5c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: d152123a74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: Ieb870030aaf1cd3354c2b20aa99f9c356e6878d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:58:13 +00:00
Bill Yi
88d7f8f441
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours am: a8cf863944 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: Id208c14207c5e1d71e62fdbbdf26930c090ba899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:55:37 +00:00
Bill Yi
85a168d3da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: a69c05227f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I5324b4d4d3c56cb7d6c6238223441c8d8c8aa54c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:50:57 +00:00
Bill Yi
7c411855f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: a20c952bb6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I2f6fef157726b19b540457edbfd08c5b0e4f3588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:49:54 +00:00
Bill Yi
4efafe43bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: d6c479940a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Iae9bc475807913f2707edfd1470613c535c6b4a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:49:48 +00:00
Bill Yi
0aafcc81f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours am: 60f3e2d53d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I4a3471957af3c76235929e9eb6da89ccb9fb7155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:49:10 +00:00
Bill Yi
fec819220b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: 32b73cd4ea -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: If4718b30ee626a955a2da4d2d577116cde5bd6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:48:15 +00:00
Wenhui Yang
08d11518a8
Fix face model delete message
...
Add new strings for face model deletion when fingerprint unlock is available.
Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
(cherry picked from commit 5e71aee4cd
2023-06-13 18:37:26 +00:00
Bill Yi
d152123a74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I9b83f96b046054735004994bba24dba2b53c610f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:15:54 +00:00
Bill Yi
a20c952bb6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I2b1476f7e11814649388cc8c08c976b1bb1a643d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:15:33 +00:00
Bill Yi
a8cf863944
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I1714b84269a401d01b495d3f49f66e02503cddd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:49 +00:00
Bill Yi
3c06cd86dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: Id84189ff76fa9c3b93c7448798348306bfe5b380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:29 +00:00
Bill Yi
60f3e2d53d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Ic267c3e00a34a48e259821fff2849694b2133b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:28 +00:00
Bill Yi
71c6887a4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours am: c7d760438a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: Ibf4a9de8f2dc4afb7ccb294c8fe25f33b516b692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:06 +00:00
Bill Yi
a69c05227f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Ib5369b78bd17ca328b46ac2e85162ee01d84ff35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:06 +00:00
Bill Yi
d6c479940a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours am: c52befa925 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I16e4ea1236aeaa79775823d623d3621e051a1e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:11:45 +00:00
Bill Yi
c7d760438a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I31527b6935660fe76669f6d711beb978e55600b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:05 +00:00
Bill Yi
32b73cd4ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I5cc0f93640e97a83a96c3e37d1a891dd0dd82d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:04:11 +00:00
Bill Yi
c52befa925
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Iab183d63901b1abd798cce19c452634518daca35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:03:19 +00:00
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
