Aleksandar Kiridžić
c449423483
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: I9ead6c07f3f8c8b901301a7eed9de148490b4bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 18:43:15 +00:00
Hao Dong
c24e305fbf
Wait for systemui udfps overlay ready to show settings udfps enroll view.
...
Previously, we show settings's udfps enroll animation view (the fingerprint icon and progress view) once the FingerprintEnrollEnrolling is shown.
However, touch events have to wait for systemui's udfps overlay to be valid. This CL lets settings's udfps enroll view wait for systemui's overlay.
1. Sets udfps enroll animation view's default visibility Gone.
2. Propagates FingerprintManager#onUdfpsOverlayShown to
FingerprintEnrollEnrolling and when it's called, set the enroll view
visible.
Besides, this CL renames onPointerDown() and onPointerUp() with Udfps.
Bug: 280718879
Test: atest FingerprintEnrollEnrollingTest
Change-Id: Ieed3e74c182828918785edcacb021f19a3665f2a
2023-06-07 17:59:11 +00:00
Aleksandar Kiridžić
b5b15a6689
Merge "speech: On-device recognition settings profile selector" into udc-dev
2023-06-07 17:53:38 +00:00
Fabián Kozynski
5ec8f8d315
Fix typo in product string
...
Fix the typo so the string displays in the correct products.
Test: manual, using tablet product
Fixes: 284007230
Change-Id: I970c214f46e0d30ecb92ff8f24c6f3fd8dfe33e3
2023-06-07 12:45:41 -04:00
TreeHugger Robot
060250ded2
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
am: 9b68c3c9c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556
Change-Id: Ie63476cbbc3efc7d3d00a7b9bcc0c1772d33e327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 13:44:52 +00:00
TreeHugger Robot
9b68c3c9c1
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556
Change-Id: I5f9975f49ec0793eabf171c5dba0791683ab0d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 13:03:22 +00:00
Zoey Chen
3b698670ad
[Regional] Change the wording from "Use app default" to "Usw default"
...
Bug: 282890644
Change-Id: I0735b38afd666895bf9801170bea6178f9ba6292
Test: manual
2023-06-07 12:40:05 +00:00
TreeHugger Robot
3e374cc7a7
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev
2023-06-07 12:13:51 +00:00
George Chang
6b83876c1e
Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
am: 29dd0bf796
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036
Change-Id: I4ed20c3448a6b8be5065efd6cad0b1ef765135d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 10:15:29 +00:00
tom hsu
bf7865b27e
[Settings] Fix crash when user enter bluetooth page quickly.
...
- When SliceManager try to pinSlice, process may not have the permssion
yet, so in Androix lib it use try/catch to avoid Security exception.
However, if SliceManger quickly unpinSlice after pinSlice, process
may still not get the permission yet, then due to no security
exception, it cause the settings crash.
Bug: 283065718
Test: atest passed
Test: Manual test passed
Change-Id: I2293fca73e65dfaa34237abe57e0c6a3fe0f62bb
2023-06-07 09:37:21 +00:00
George Chang
29dd0bf796
Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036
Change-Id: Ifc98c5ea76ad9fb5205ec3421470ebd7bf17473c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 09:33:13 +00:00
George Chang
832e0b015e
Merge "Correct typo in the launch via NFC bottom string" into udc-dev
2023-06-07 09:02:51 +00:00
SongFerng Wang
fb0186c690
Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644
Change-Id: I991eb37e42817dba11b4b0404fa5915e6a35ab36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 03:36:07 +00:00
SongFerng Wang
add7deceb2
Merge "Add the log and moving it into onResume" into udc-d1-dev
2023-06-07 02:45:20 +00:00
SongFerng Wang
8b1bfeef73
Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859
Change-Id: Ibff4ceef103e798e1e27ee413009ccac92a79cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 02:09:50 +00:00
SongFerngWang
ea85e3b2fa
Add the log and moving it into onResume
...
Since user can open two settings app(one is via settings app button and other one is via quick settings) and user can switch them to foreground by the recent page. If user can goto the deviceDetails at Settings_A and then changes the config value at settings_B, then the user goes back Settings_A to check the UI. If config is in the init, the UI can't refresh the UI.
Bug: 285086232
Test: build pass.
Change-Id: I2284940eddcd02c543522b60f951c0d8d25775fd
2023-06-07 01:45:31 +00:00
SongFerng Wang
4929da451c
Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev
2023-06-07 01:33:59 +00:00
Wenhui Yang
4eceb6c5c5
Merge "Fix face model delete message" into udc-qpr-dev
2023-06-06 21:09:56 +00:00
Ale Nijamkin
163c01ab4c
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
am: 1e3ecf6352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: Ie370f2e7fe8e473d46fec5a88ee831042d47903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 20:27:23 +00:00
Ale Nijamkin
1e3ecf6352
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: I93ad7cae5cf900539bbded918807ea19b4c358b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 19:44:29 +00:00
Wenhui Yang
5e71aee4cd
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
2023-06-06 19:44:17 +00:00
Ale Nijamkin
b5dda005fd
Merge "Fixes nav stack issue." into udc-dev
2023-06-06 18:48:59 +00:00
Matías Hernández
ff255c6eda
Don't hide approved NLSes in Settings
...
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.
Bug: 282932362
Test: manual
Change-Id: I4c9faea68e6d16b1a4ec7f472b5433cac1704c06
2023-06-06 19:07:58 +02:00
Treehugger Robot
1a02d5733e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559399
Change-Id: I0fafd92ec660c4538dbf271853586f583bed6d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:50 +00:00
Bill Yi
90d348eabc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559399
Change-Id: Ibc73ddf4d3a46111f76e580d39716cf5cfa194f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:42 +00:00
Treehugger Robot
650273ab86
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559397
Change-Id: I4daf75a74251228c07412348cabc533b2e4b8b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:37 +00:00
Bill Yi
9c4773b9ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559397
Change-Id: If0cbc0e34e0b364db859ea276370aadffa440e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:17 +00:00
Treehugger Robot
7858247c64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c1fdb0bec2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23558603
Change-Id: I4622ca39108918a59f21f22797d6674176686411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:03 +00:00
Bill Yi
23022e0835
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16b5dd96c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23558603
Change-Id: I5b6c3746f36c1b969acc795ab4347b6665b791fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:37:52 +00:00
Treehugger Robot
44ccdc1fee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba
-s ours am: 059773bd86
-s ours am: 1dc6b2d265
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: If928bd144616d329e8f1ea22500705541dbb15b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:34:41 +00:00
Bill Yi
e881cb0f82
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb
-s ours am: 284d320abb
-s ours am: c0e9862110
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I0b81faa7fc904e9c0ae12ca9603448baa892ca55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:34:37 +00:00
Treehugger Robot
7e87dbe180
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc
-s ours am: 12ec34641e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401
Change-Id: I43a85864fbad3af98f65c01a7f236548ed173093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:33:20 +00:00
Bill Yi
702dadee71
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670
-s ours am: fe99021d55
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401
Change-Id: I7de4db1c7383dd4b2ce852d4164cb1c37eb4b23a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:33:14 +00:00
Treehugger Robot
e5649218f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485
-s ours am: 04f844c712
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396
Change-Id: I8ded5450405b9612f8e38db5d9eba6500a2edac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:33:07 +00:00
Bill Yi
ff6629bf08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e
-s ours am: 5e71a3fdf4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396
Change-Id: Ifec471e13bf49ce8f294ff218ce9cf4a857cfd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:32:50 +00:00
Treehugger Robot
d38c1958fa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64
-s ours am: f14e96fe88
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244
Change-Id: I9e63a80f3e00e7642f729fccf693b8d3097ac9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:32:37 +00:00
Bill Yi
6b2bcbd3ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf
-s ours am: 4fdf445fc4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244
Change-Id: Ia1198a941fb054b4eefa1adc89735a1141f7e5de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:32:28 +00:00
TreeHugger Robot
0fc88fe5ec
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-06 15:05:24 +00:00
TreeHugger Robot
ce5a816f29
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-06 15:05:24 +00:00
TreeHugger Robot
6c069119ea
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-06 15:05:24 +00:00
Treehugger Robot
fb4945a4ae
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-06 14:58:40 +00:00
Treehugger Robot
8db6cc323c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-06 14:58:40 +00:00
Treehugger Robot
c1fdb0bec2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-06 14:58:40 +00:00
Treehugger Robot
1dc6b2d265
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba
-s ours am: 059773bd86
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I72e52377e732dfa56e16340b98aa6660ca06858f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:51:01 +00:00
Bill Yi
c0e9862110
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb
-s ours am: 284d320abb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: If5c7d94531d805bce9a9cab5dad7a3101e384973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:50:56 +00:00
Treehugger Robot
12ec34641e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401
Change-Id: I08b52fc6dc39253d43dcebb5eb32bd4dc0bce3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:33 +00:00
Bill Yi
fe99021d55
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401
Change-Id: I27f7e7aebe7833c9c406fbde1bcd905ac848adfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:27 +00:00
Treehugger Robot
04f844c712
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396
Change-Id: Ie1f7e796600b5ed714c99ae7fa74cf8455962030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:23 +00:00
Bill Yi
5e71a3fdf4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396
Change-Id: Id98b771b0dbd7773b3574cbb6d65cacce5d72e4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:08 +00:00
Treehugger Robot
f14e96fe88
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244
Change-Id: I55893373046dc2d041b6b9fe8b5bba6ff4fd8b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:48:55 +00:00