Diya Bera
cd9bfa0c8b
[automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
am: afa29d5cb8
-s ours am: 63c145445b
-s ours
...
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842
Change-Id: Id571f7c562a5ea1c2c9a627f6dbc1576fbff4b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 02:18:04 +00:00
Chris Li
01fa5fa6aa
Update EmbeddingAspectRatio to the latest am: 81ee016a6e
am: 32d271dfb3
am: aabd2ee494
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464
Change-Id: Ia2f0149bf4bc0231c86198cc870e63cd8d413603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 02:00:42 +00:00
TreeHugger Robot
4b4b0cf83b
Merge "Fix checkcolor_hook error" into udc-dev
2023-03-03 01:52:59 +00:00
Diya Bera
7cb164d0c1
[automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a
am: f3012c6497
-s ours
...
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025
Change-Id: Ieed83b86abaedc2c6f49bc859ee3c51dde81763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 01:37:20 +00:00
Diya Bera
63c145445b
[automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
am: afa29d5cb8
-s ours
...
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842
Change-Id: Ia1f47a216186d1819d70dfaa89af04a6e3341edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 01:37:05 +00:00
Diya Bera
f3012c6497
Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025
Change-Id: Ic8b8eea0c25961ccc05b3d344161e1a194104b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 01:26:01 +00:00
Diya Bera
afa29d5cb8
Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842
Change-Id: Ia2a62797dd783366a5d2df4494a25d748fac7995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 01:24:11 +00:00
Chris Li
aabd2ee494
Update EmbeddingAspectRatio to the latest am: 81ee016a6e
am: 32d271dfb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464
Change-Id: I59f466f5c34469e77455ef7332cd14237ac4162c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 01:20:54 +00:00
Phil Weaver
64c23fc5cf
Revert "Add discrete contrast UI slider in the setting"
...
This reverts commit fd3911ba29
.
Reason for revert: Setting will be re-landed in developer settings. Not currently aligned with other accessibility features.
Change-Id: If896d87b0bd6d5e74422c1919e60d8717d28a1d0
2023-03-03 00:53:07 +00:00
Wenhui Yang
07ca5b7e4e
[DO NOT MERGE] Fix tablet verify pin wording
...
Test: Manual - Reset tablet without removing accounts, observe the texts
displayed correctly for tablet. Expanded related for devices.
Fixes: 267539281
Fixes: 270516438
Change-Id: If2ad3692b9fb2c8a374d8e988aac76a7254b8cd6
2023-03-03 00:10:18 +00:00
Diya Bera
47cedbde0a
Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev
2023-03-02 22:21:12 +00:00
Diya Bera
97f99f5d30
Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev
2023-03-02 21:22:46 +00:00
Chris Li
32d271dfb3
Update EmbeddingAspectRatio to the latest am: 81ee016a6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464
Change-Id: I45ffde90d1b91b709b6e00622a789722c7cd750f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 20:46:57 +00:00
Diya Bera
4afe665577
Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408
Change-Id: Ic344db9a90e1266de105ebcc4c7ad9bc8f7f4ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 19:31:52 +00:00
Diya Bera
961b32ca28
Learn more updated in Fingerprint Settings for side fps
...
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
Merged-in: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
2023-03-02 19:09:34 +00:00
Diya Bera
4c3ac9b994
Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev
2023-03-02 19:09:23 +00:00
Diya Bera
327eaf16fb
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
Merged-in: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-02 18:42:02 +00:00
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