Treehugger Robot
9c4b3ad72b
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
am: c0338e5dc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981
Change-Id: Ie7e71eb056a9976296dd2d6da95cc03f1e01ebe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 01:37:16 +00:00
Treehugger Robot
24e8361e2a
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
am: c0338e5dc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981
Change-Id: Ibbbcddcfadfbadcc66cbf2673f34ab8a1d29e2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 01:33:40 +00:00
Treehugger Robot
c83e401444
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981
Change-Id: I25e8ab52aa7a285e22ec067d56d1a4a2e3252ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 00:50:56 +00:00
Treehugger Robot
c0338e5dc3
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981
Change-Id: I452681812b4be6dccae36f3ec711e992a31b9924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 00:50:15 +00:00
Treehugger Robot
a34a510a40
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev
2023-06-08 00:15:18 +00:00
Aleksandar Kiridžić
9a2120768a
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
am: c449423483
am: 1a54d94eb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: I53b7dec6fbcad4cd5cb35ea5dc8e5553fc0913a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 20:58:03 +00:00
Aleksandar Kiridžić
3335569442
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
am: 9b20255944
am: ed0645b380
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: I36c9b76e857c987324494dc753a733f52a327cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 20:54:44 +00:00
Aleksandar Kiridžić
94b8257176
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
am: c449423483
am: e2d8e56c61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: Ic78a3af95c49680efc5bad6e3d13e7d6abb048f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 20:53:07 +00:00
Aleksandar Kiridžić
ed0645b380
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
am: 9b20255944
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: I0579c1c53126548e60aea7bd3f26aaf802060e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 20:08:14 +00:00
Aleksandar Kiridžić
1a54d94eb1
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
am: c449423483
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: I24fd223f7fa7e0450be675b1d5f214ef3a40fb52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 20:08:00 +00:00
Aleksandar Kiridžić
e2d8e56c61
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
am: c449423483
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: I18fd5f9209b5c7dc965ffed95751f8059eb95c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 20:03:18 +00:00
Oli Thompson
ab73c1a3e3
Fix low contrast on work challenge screen emergency call button
...
Bug: 285718470
Test: btest a.d.g.WorkTelephonyTest#workChallengePinScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Change-Id: I546e30e7f0b9b5eccd54e912274eeb6ba1a7a6e6
2023-06-07 19:25:59 +00:00
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
Aleksandar Kiridžić
9b20255944
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: I3b15f067f124ff17d7c540e2ca9dff5100178bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 18:38:59 +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
90f0f3ef3d
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
am: 9b68c3c9c1
am: 060250ded2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556
Change-Id: I059a3d8a8ff10ce547cab0e453c024f0d59d8e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 14:29:20 +00:00
TreeHugger Robot
0a14afb258
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
am: 5943e14bc3
am: d60ff26d9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556
Change-Id: Icad930081c90a9fd6fdce582d6e293e38ea45a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 14:24:36 +00:00
TreeHugger Robot
734d68d694
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
am: 9b68c3c9c1
am: 99c0145565
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556
Change-Id: Id1dacaca9b06530ae9431faaf8a36783e2280576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 14:24:22 +00:00
TreeHugger Robot
d60ff26d9f
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
am: 5943e14bc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556
Change-Id: I2b2a2671f43ada1de08c5c766dfbbc4cf38b6e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 13:45:47 +00: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
99c0145565
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: Ie47f1d1d909d7f753619ff91041e24d58ae934fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 13:40:42 +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
TreeHugger Robot
5943e14bc3
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: I31a51edc4d856fab0127545e6e6acdf547c027c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 12:59:49 +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
aef49ffac7
Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
am: 29dd0bf796
am: 6b83876c1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036
Change-Id: I32a8bdc671ccab0bc2b065b802bf2da5b98cc73d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 10:58:30 +00:00
George Chang
f836b3ca47
Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
am: f63518f864
am: 2229a3393f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036
Change-Id: I66076a63ec52972a918f4b16cb6be20d9ee039bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 10:53:08 +00:00
George Chang
f3160735e4
Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
am: 29dd0bf796
am: cb5b26ff73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036
Change-Id: Ie331e2ac5c1d3701ae16d123610752e6f6554082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 10:53:00 +00:00
George Chang
2229a3393f
Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
am: f63518f864
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036
Change-Id: I3f127a822fff7c5e64918e3b9a1619e67a307309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 10:15:56 +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
George Chang
cb5b26ff73
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: Ibb5362d87f383062376173d2820f8fbb80506deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 10:11:22 +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
f63518f864
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: I1b0246e219089604709900c2d8deb8d2e3d8a565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 09:29:02 +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
9a3ed90542
Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2
am: fb0186c690
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644
Change-Id: I3b515b693c81ed1007f7ec229fcf76b5308c90ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 04:39:50 +00:00
SongFerng Wang
375259c986
Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2
am: 1f80bf93aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644
Change-Id: I0dfbb7d60d5b329c5fd72af814ba27a0abad917a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 04:34:11 +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
1f80bf93aa
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: I51d34675109e1b428e0c1c45941f0462bf55b1c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 03:32:04 +00:00
SongFerng Wang
7ad90a31bb
Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c
am: 8b1bfeef73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859
Change-Id: Ib9b06dbb5570660063dc1c64850867d34b951e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 02:53:28 +00:00
SongFerng Wang
dfaa1b0337
Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c
am: 3a07547d81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859
Change-Id: Ib2d81c7e382968788ae084e2d07fa21ca4ee1dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 02:47:50 +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
SongFerng Wang
3a07547d81
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: I919d6d7e09a7cdff2550bd667a1cb5fcb435b610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 02:05:51 +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
e947da08e3
Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573016
Change-Id: I1aa4a7a33a14adae4a5fcbe1f443b3af89ed674b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 21:12:54 +00:00
Ale Nijamkin
65e9aee62f
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
am: ef6f54982a
am: 649eecde6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: I5e29fa05f6e2a1097e0880a1549e37cc9559e4f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 21:12:51 +00:00