Diya Bera
a2c16a2643
Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465
Change-Id: I7202f15c530fe3c7f5ae94d011b12d83717db2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 17:27:04 +00:00
Diya Bera
36e41dc985
Merge "Removed subtext from side fps enrollment flow" into udc-dev
2023-03-02 17:16:31 +00:00
Jason Chang
081b7c63d5
Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev am: a441922bdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21598459
Change-Id: Icae2ef1d3d4214d1accbaf861a35ee0f0bbb460a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 17:07:50 +00:00
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
Vania Januar
4bdff64e80
Show single icon layout for unknown device type in advanced header.
...
Bug: 270654477
Test: AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I24a42693a66664caa460d44245a68e3606e98481
2023-03-02 13:37:25 +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
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
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
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
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
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
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
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
Hao Dong
528bd9781e
Merge "Do not announce a11y move instructions in sensor area." into udc-dev am: b48c247ef9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617790
Change-Id: Ic0f432c7a66ba0bee641dde4cbf58a896857ec47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:54:45 +00:00
Hao Dong
b48c247ef9
Merge "Do not announce a11y move instructions in sensor area." into udc-dev
2023-03-01 22:53:23 +00:00
Menghan Li
38c447dbd9
Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev am: bb5f8cef7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649784
Change-Id: I1b45379004b946d9a5c45bb59ad6d75840e7f88a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:19:43 +00:00
Joshua Mccloskey
11bc7f02bb
Merge "Modified fingerprint enroll test" into udc-dev am: c75baeb774
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21676287
Change-Id: I038f596beeeae897ddfea95cea5039c4925d3055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:17:52 +00:00
Menghan Li
bb5f8cef7d
Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev
2023-03-01 21:30:18 +00:00
Joshua Mccloskey
c75baeb774
Merge "Modified fingerprint enroll test" into udc-dev
2023-03-01 21:27:30 +00:00
Joshua McCloskey
187fe08143
Modified fingerprint enroll test
...
Test: m -j40 RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 271134136
Change-Id: Ic96407199a8394ac184a60229f371ee93838c926
2023-03-01 19:51:36 +00:00
Bill Yi
b6a93a192b
Merge changes from topic "tc_change_23022712_26" into udc-dev am: cb44abff19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606457
Change-Id: I6f3f550b8eb8508537647ba82c50b5fab705bb84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 19:11:25 +00:00
Bill Yi
f3086af940
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c42f31df9d
am: 6f0694df62
-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: Id8833359ae48495826b97628a588c7f94fb886e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 19:10:59 +00:00
Julia Reynolds
f0bb4e8ce7
Merge "Remove jank on DND schedule page" into udc-dev am: a0c9ce5b2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650757
Change-Id: If2c8d642016d0585dd66caf89e5d70a27ecd4e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 18:59:22 +00:00
Bill Yi
cb44abff19
Merge changes from topic "tc_change_23022712_26" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c42f31df9d
Import translations. DO NOT MERGE ANYWHERE
2023-03-01 18:47:31 +00:00
Bill Yi
444be016ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f6244e41d4
-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: Ic71a1a0bcb4a855a32974ce3130a7eb53f1c76d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 18:43:38 +00:00
Julia Reynolds
a0c9ce5b2f
Merge "Remove jank on DND schedule page" into udc-dev
2023-03-01 18:43:11 +00:00
Bill Yi
e39eae202c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eb8b786fe
-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: Ib1a758faebe9bca0f025db26015a873c9c5427e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 18:43:06 +00:00
Julia Reynolds
cb6a88b862
Remove jank on DND schedule page
...
Only add/or remove preferences when absolutely needed.
Also fix a 'load data from backend' method that wasn't.
Fixes: 216747934
Test: ZenModeAutomaticRulesPreferenceControllerTest
Test: view schedules page
Test: add schedule
Test: remove schedule
Test: view schedule child page and return to schedules page
Change-Id: I237c2ca7ea89ee6e42354470a76712068a7f4dd7
2023-03-01 18:43:02 +00:00
Bill Yi
b546c56353
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b25ac20f23
-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: I42b7fcbb27c07bd03fa97847b0065cb495f5f791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 18:41:59 +00:00
Bill Yi
ebb5398309
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85eeec4806
-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: Icf92cc2364fb7a81737accef498c100799b253bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 18:41:06 +00:00
Bill Yi
f6244e41d4
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-03-01 18:12:33 +00:00
Bill Yi
b25ac20f23
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-03-01 18:12:33 +00:00
Vania Januar
c1429bcb40
Handle DEVICE_TYPE_STYLUS in advanced details header.
...
Bug: 270654477
Test: AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I725dd575ba56bf86e1336094961e769b81540479
2023-03-01 17:22:15 +00:00
Bill Yi
8baecfab5c
[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 skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I99e48c5a1d6b0da7b741ee6ba82018c308814617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 14:08:50 +00:00
Bill Yi
2697dc29fc
[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 skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I5f814077dbc5cbcf3a68fc19a003bf6d1120d597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 14:08:48 +00:00
Bill Yi
5f755572b0
[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 skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I3bfa33a7c2ae8c26357f7d616104badfe370e9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 14:08:43 +00:00
Bill Yi
f8126117fe
[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 skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I909f40b5fa690beb258733eb0f71e63f3d19f0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 14:08:29 +00:00
Bill Yi
b0cf8a0e4c
[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 skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: If03edb8b429c4caeb6d04327da85c0103149eb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 14:08:10 +00:00
Bill Yi
c663a47b28
[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 skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I0e33c628a9fd8b3fb86d9a5016de9b429ca3f503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 14:07:55 +00:00
Ahaan Ugale
bd9a87a9a0
Merge "Update Autofill OWNERS" am: e35606efd3
am: b238ee99cc
am: 96cb0fb4bd
am: 9cc184e3cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: I5e7c61c7d8e1d52fa1a43f3283fb15b71dad4f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 14:03:11 +00:00