ykhung
03442225a3
Update incompatible charging string based on UXR suggestion
...
Bug: 246960554
Test: atest
Change-Id: I19ed65d17a538bf6c3c95a121d699e4a1a8ca7b1
2023-03-03 00:50:59 +08:00
Jason Chang
a441922bdd
Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev
2023-03-02 16:24:16 +00:00
Chris Li
81ee016a6e
Update EmbeddingAspectRatio to the latest
...
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.
Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
(cherry picked from commit af2b07b248
)
(cherry picked from commit 1092486873
)
2023-03-02 15:56:45 +00:00
Vincent Wang
0d29ea83cb
Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1
am: ce2ee1bbc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082
Change-Id: Ia9f3bb640f2022a833391d4ebd59004e3cc7963b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 14:03:03 +00:00
Vincent Wang
71945b2919
Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1
am: baa851a640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082
Change-Id: I1ff4b3ef6dbc5db91d942c034a60f1b7a42dec27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 14:01:49 +00:00
Vincent Wang
baa851a640
Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082
Change-Id: I303f5583775ddb7fa038c4b8e6ae339090f4929c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 13:28:37 +00:00
Vincent Wang
ce2ee1bbc4
Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082
Change-Id: I71e7e93d282e248523cb70a091482c7e9b29df99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 13:28:02 +00:00
Sunny Shao
d32647d890
Fix checkcolor_hook error
...
Bug: 271373417
Test: repo upload OK
Change-Id: I60fd9ec6c6f47c5885bf7176d2143ab8131ea9a5
2023-03-02 21:23:12 +08:00
Vania Januar
14f8af4b52
Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev am: 8ba47734ad
am: e4e9b66a03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673463
Change-Id: I6b2db76adf204f3e63a990f826388eaedd95c709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 12:56:49 +00:00
Vincent Wang
98819227f1
Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev
2023-03-02 12:55:19 +00:00
Vania Januar
745d4d8879
Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev am: 8ba47734ad
am: b5c70634b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673463
Change-Id: Ie4522cf5b88bb8fab50deda7ab8bdbc3e929e5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 12:50:42 +00:00
Vania Januar
b5c70634b4
Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev am: 8ba47734ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673463
Change-Id: I9601d15e4573184f55a2362526d44661632d6f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 12:21:10 +00:00
Vania Januar
e4e9b66a03
Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev am: 8ba47734ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673463
Change-Id: I5a1066ba6acf1a75cf43d29557a7ce3de24dd0ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 12:20:19 +00:00
Vania Januar
8ba47734ad
Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev
2023-03-02 11:46:58 +00:00
Bonian Chen
28367dae4d
[Settings] Customizable resource for hiding 3G preferred network type
...
Add a customiazble resource for specifying the carriers that avoiding
from showing 3G option within the preferred network type.
Bug: 261615630
Bug: 247995343
Bug: 268564499
Bug: 265147144
Bug: 267433657
Bug: 240176276
Bug: 266724047
Bug: 265147263
Bug: 242017692
Bug: 220998105
Bug: 209835551
Bug: 237837196
Bug: 239318933
Bug: 247996564
Test: local
Merged-In: I8092372372cb334b5ac1956b869d194b9fcd0523
Merged-In: I5c12ad23a240fbe70630855e5f98b5be83912674
Change-Id: I8092372372cb334b5ac1956b869d194b9fcd0523
2023-03-02 10:47:00 +00:00
Vincent Wang
3ff1939b59
Fix Incorrect lottie status on the beginning of enrolling UDFPS
...
Bug: b/271209610
Test: 1. adb root
2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
3. Excute fingerprint enroll process & check the state of enroll progress is
correct
Change-Id: I3cac369e9dcf939a09dce11a7b9e96952bceeee8
2023-03-02 07:24:43 +00:00
Jason Chang
c3fae47144
(2/2) Fix No clear steps for "re-enroll face unlock
...
When the user has face id registered but failed enrolling in
device lock state, lead users directly to the confirm deletion
dialog in Face Unlock settings.
- When receiving a face id re-enroll extra intent data, lead users
directly to the confirm deletion dialog in Face Unlock settings.
Bug: 233069240
Test: manually force enrolling face id fail, then doing test steps:
1. Receive notification that face unlock needs to be re-enrolled
2. Tap it then entering device
3. Check if showing the confirm deletion dialog in Face Unlock
settings.
Change-Id: I4eb09cf4a7d92a1dd9866c5c8b938aeb8c7eddf5
2023-03-02 06:53:31 +00:00
Jason Chiu
7ff9d824e9
Merge "Eliminate the injection flicker while navigating back" into udc-dev am: bfd3c051be
am: 3525c25d85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659505
Change-Id: Iaec04625fdae44ca8068b7937bdc56bfc8c28b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 03:52:05 +00:00
Jason Chiu
1c4d1ca19a
Merge "Eliminate the injection flicker while navigating back" into udc-dev am: bfd3c051be
am: 207b47c696
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659505
Change-Id: Ib8402b47391f59f505b82040fa6eebb3b4eec56e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 03:47:09 +00:00
Angela Wang
460eb2e686
Merge "Updates Flash Notifications string resources" into udc-dev am: 926352a668
am: 10320b9112
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21648107
Change-Id: I3e6813855abf111484a0eeb941a290c19132bcad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 03:38:33 +00:00
Jason Chiu
3525c25d85
Merge "Eliminate the injection flicker while navigating back" into udc-dev am: bfd3c051be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659505
Change-Id: I58bc595eac87752601f217b86ec327f98ce13ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 03:15:25 +00:00
Jason Chiu
207b47c696
Merge "Eliminate the injection flicker while navigating back" into udc-dev am: bfd3c051be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659505
Change-Id: I36b4b51306b04c6e872c95a350cc53b668659d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 03:15:14 +00:00
Angela Wang
63b8e19da6
Merge "Applies feature flag on Flash Notifications" into udc-dev am: aa9f7660c8
am: 86d150f5c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508166
Change-Id: Ib1de918bda2d972f7005a300dab53d2c9edf1315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 03:07:43 +00:00
Hao Dong
daa2e3bee6
Merge "Do not announce a11y move instructions in sensor area." into udc-dev am: b48c247ef9
am: 8ffff83d33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617790
Change-Id: Ie02be2682d0510009aeb81c6e0079c23398d938a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 03:00:13 +00:00
Angela Wang
813dced67c
Merge "Updates Flash Notifications string resources" into udc-dev am: 926352a668
am: 83ee88fcac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21648107
Change-Id: Ic9ded050f113a7d7bd75049d8cb33a7f99a9b0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 02:50:43 +00:00
Angela Wang
0dc987ef80
Merge "Applies feature flag on Flash Notifications" into udc-dev am: aa9f7660c8
am: 022b41c2b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508166
Change-Id: I2ff4ff52f03502e9c04d8b450970ba6e06385ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 02:44:58 +00:00
Jason Chiu
bfd3c051be
Merge "Eliminate the injection flicker while navigating back" into udc-dev
2023-03-02 02:34:14 +00:00
Angela Wang
83ee88fcac
Merge "Updates Flash Notifications string resources" into udc-dev am: 926352a668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21648107
Change-Id: Ie0d224b76ff6d0d530eca46d65d225d35216c4ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 02:20:46 +00:00
Menghan Li
44dc7e69ce
Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev am: bb5f8cef7d
am: 6429492245
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649784
Change-Id: I3929442abbb461ea9df62bcc46488233c2417f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 02:18:37 +00:00
Angela Wang
10320b9112
Merge "Updates Flash Notifications string resources" into udc-dev am: 926352a668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21648107
Change-Id: If266445d844a0e182c747c37f382598d7f38a4e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 02:18:04 +00:00
Angela Wang
022b41c2b8
Merge "Applies feature flag on Flash Notifications" into udc-dev am: aa9f7660c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508166
Change-Id: I684233573fe6f5d019a849fd439b7d01aefd79f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 02:06:23 +00:00
Angela Wang
86d150f5c0
Merge "Applies feature flag on Flash Notifications" into udc-dev am: aa9f7660c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508166
Change-Id: Ia61af7b5ab56a497103d89d7a9a416738b4483e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 02:04:34 +00:00
Angela Wang
926352a668
Merge "Updates Flash Notifications string resources" into udc-dev
2023-03-02 01:56:08 +00:00
Angela Wang
35db5e8d3d
Updates Flash Notifications string resources
...
A few formatting changes that are needed to align with Android Accessibility UX patterns.
Bug: 270418490
Test: checks the changes manually
Change-Id: Ia5bd9fa1b8c9c32f9d430f54788e995816c2ee52
2023-03-02 01:55:30 +00:00
Angela Wang
aa9f7660c8
Merge "Applies feature flag on Flash Notifications" into udc-dev
2023-03-02 01:53:27 +00:00
Joshua Mccloskey
3bf29d7f35
Merge "Modified fingerprint enroll test" into udc-dev am: c75baeb774
am: 2f503a8f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21676287
Change-Id: I4e6cc24a492e5d9f3314f445a9eb3928b8470cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 01:23:15 +00:00
Bill Yi
93ac03e42a
Merge changes from topic "tc_change_23022712_26" into udc-dev am: cb44abff19
am: 9b83c59bf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606457
Change-Id: Ic03e6b1088e41fd4f451d98721df95c6f0021c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:57:38 +00:00
Bill Yi
eb9ec96b04
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c42f31df9d
am: 6f0694df62
-s ours am: 60193a79c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606457
Change-Id: I998b116252558e45a2e803de005e30c6feffe873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:57:06 +00:00
Julia Reynolds
34ddea638a
Merge "Remove jank on DND schedule page" into udc-dev am: a0c9ce5b2f
am: cf46c546ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650757
Change-Id: I49fce7757974192e427da87d26d1492ba9663a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:32:40 +00:00
Bill Yi
867d51f97c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f6244e41d4
-s ours am: c8a792e18f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21607019
Change-Id: Ia7ffa9b81492cb0efccb4a61e3e89e76fcc73321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:27:00 +00:00
Bill Yi
7a0e1fd843
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eb8b786fe
-s ours am: 85b5d74c9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21607019
Change-Id: Ia4172faa4a55ba416a6adae428feb57d1b7a4991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:26:52 +00:00
Bill Yi
4240063184
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b25ac20f23
-s ours am: 4d2f7b8349
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606722
Change-Id: I5a2e51c944d0b6d9edd978b3c4b243d6b06238e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:26:27 +00:00
Bill Yi
b52704f36a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85eeec4806
-s ours am: ae87762751
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606722
Change-Id: I1ca55ff99aaab12181bffdfcc79e51b0664a960c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:26:03 +00:00
Bill Yi
8ecd582217
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4
-s ours am: ea2310e0fe
-s ours am: 8ff2cfceab
-s ours am: 1ae472af4d
-s ours am: 3fa074e985
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I8c9b7c5165e160783fdcc0d8ee1654c331df8dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:50 +00:00
Bill Yi
6bd263b740
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3
-s ours am: 960eae9a2f
-s ours am: cec67a1ee1
-s ours am: b3a751453e
-s ours am: 70d60b8130
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ic8dfdcc32df927052dc3dc18a415c2acf014adb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:46 +00:00
Bill Yi
51010df8f0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215
-s ours am: 71ad7ad49e
-s ours am: 3ba3148e2f
-s ours am: 0d65b28b99
-s ours am: 97f2103ab2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I22ef889d644a265d095ec0aec7a0496bc6fa0e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:41 +00:00
Bill Yi
a9e83f5c94
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2
-s ours am: 9de8ff63dd
-s ours am: 75304e1ff5
-s ours am: 4594e953c7
-s ours am: 1898979be7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I91c0396c7b02655bf9d53737780264e1db8eeac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:31 +00:00
Bill Yi
a8b1701b23
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594
-s ours am: cac65afe79
-s ours am: 3d4d0267c6
-s ours am: a64f4a4585
-s ours am: c18b5b610a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I207b98de49407fc530aa432a78086d73ef68183c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:11 +00:00
Bill Yi
ab055002c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad
-s ours am: d3fa508918
-s ours am: 858813dc33
-s ours am: 27cafd0dfa
-s ours am: 4a6f525aa5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I7de7ac98fb750b7cd0664c8cb3c08ef3b622706b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:36:44 +00:00
Diya Bera
7fa342fadb
Removed subtext from side fps enrollment flow
...
Test: Manual (Try to enroll your fingerprint in a side fps device, and
observe that there is no subtext in landscape mode)
Bug: 267271891
Change-Id: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-01 23:17:27 +00:00