Grace Cheng
40e82e3a47
[automerger skipped] Fix NPE in updateAddPreference am: f58714496a
-s ours am: 0dcfdacc25
-s ours am: 2ee3088167
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: Ie148ac91f62cf55ff53e1c3df8b6b334997e2c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 19:46:35 +00:00
Grace Cheng
39f518b258
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
am: f73f073643
-s ours am: 60f4e180a2
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I730dab9c7076a3abbae467fbb30b3d9cd0298f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 19:45:11 +00:00
Matías Hernández
f03e08c644
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: 0d21526217
am: 63a50999f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: Ice022fe659e4a48ee5ae79c16f8b950479ad2b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 19:44:09 +00:00
Matías Hernández
bb3122ca29
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: aaddfd88e9
am: 9feb898da7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I029027019505a86fbf88ad4a127d6f0ffa11ce79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 19:41:36 +00:00
Grace Cheng
ab1b393412
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
-s ours am: d7e397e97c
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I666bbd8a1c16dabbab2c695c952931780f18e024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 19:03:42 +00:00
Grace Cheng
d320388f91
[automerger skipped] Fix NPE in updateAddPreference am: f58714496a
-s ours am: 0dcfdacc25
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I2be7f013fed0d18eeec29f0461e7891eabc287ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 19:03:40 +00:00
Grace Cheng
dc3404939c
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
am: add8f5cda2
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 f58714496a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I2cd78c810b1cbe4f3f8f43370e6d64b460446cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 19:00:07 +00:00
Grace Cheng
71671c1eca
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
-s ours am: d7e397e97c
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I7d179a1b1ac8465fea36a14ca04e57aed6db1cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:59:50 +00:00
Grace Cheng
2ee3088167
[automerger skipped] Fix NPE in updateAddPreference am: f58714496a
-s ours am: 0dcfdacc25
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I40e8eaf893dac682f8120213c32c28025fbbf29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:59:47 +00:00
Grace Cheng
694569f60c
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
am: 279e4c77f0
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: Icf5eabcdc24d83a3728768d47fb5b29c3da2ce9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:59:26 +00:00
Matías Hernández
281c4b631c
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: aaddfd88e9
am: e20f52a05a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I2bcd0934af1e0e4d6679e04293f04bbebcadab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:44:07 +00:00
Grace Cheng
60f4e180a2
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
am: f73f073643
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I6581685284601d4ee82c4585a922092c17e12856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:41:14 +00:00
Grace Cheng
279e4c77f0
Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I4d1d06bcff647eec3e10fa99636f301563e05ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:40:35 +00:00
Grace Cheng
d7e397e97c
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I76d59e589e5f8882f2872da723dc20975ea60a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:40:15 +00:00
Grace Cheng
0dcfdacc25
[automerger skipped] Fix NPE in updateAddPreference am: f58714496a
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: Ie5120e61d7df71adf77970088a3be7334ed6a4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:40:12 +00:00
Matías Hernández
63a50999f5
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: 0d21526217
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I66d6a9ce28f475dfb2d130bcaccdc3d2c6b8623d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:39:45 +00:00
Matías Hernández
e20f52a05a
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: aaddfd88e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I8fc3a7b239ce0545b34eafc860df72a42cfd2e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:39:16 +00:00
Grace Cheng
add8f5cda2
Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: Icaadc6f5a6c0711bf4122706363c82753a93869c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:39:15 +00:00
Grace Cheng
f73f073643
Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I691796e372f65ffec44954a850d462f796c19f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:36:58 +00:00
Automerger Merge Worker
21eb1a3802
Merge "Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: 57739acf63"
2023-06-28 18:36:21 +00:00
Matías Hernández
412fc3e2c4
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: 143d105dc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I71f428e90b132c4282827b698623ee1d43c0f7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:35:53 +00:00
Matías Hernández
9feb898da7
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: aaddfd88e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:35:52 +00:00
Matías Hernández
961f0e20d5
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: 57739acf63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I45c41e5eb54b73355427497748de259f00543d7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:35:40 +00:00
Joshua McCloskey
9642d1e8cb
Moving FingerprintSettings to Kotlin
...
This change is the first of many, it will
1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged
This change in particular is focused on transitions to and from various activities.
Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true
Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
2023-06-28 18:09:35 +00:00
Ante
fdfe10f1a7
Fix Inline UWB toggle setting
...
In settings when searching for "uwb" the inline toggle doesn't work,
this change fixes the issue. This change won't fix the issue of
correctly displaying the UWB state in case when the UWB adapter state
changed after the inline toggle was already loaded, that issue is
tracked in b/287644073.
Bug: 280643766
Test: Manually verified
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:34ea9149906ac41396afbf3d1e153f4ed60dc1ed )
Change-Id: Iddb89220921a9af0e1d97bb3d648ca8b0f42fc65
2023-06-28 17:48:55 +00:00
Grace Cheng
25b489e212
Merge "Fix NPE in updateAddPreference" into udc-dev
2023-06-28 17:41:13 +00:00
Matías Hernández
143d105dc9
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I4ab7053bffc4268cf1d0d2be5e7dbec5ba5f65d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:15:07 +00:00
Matías Hernández
aaddfd88e9
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:14:55 +00:00
Matías Hernández
57739acf63
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I4d187c9a398bf713519c8cc2c335ab1d2c2bd645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:14:40 +00:00
Matías Hernández
0d21526217
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I1e1dbbdf2b1834da763835c1bbcd263cdb27eb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:10:34 +00:00
Matías Hernández
4d34eb2c7a
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev
2023-06-28 16:42:13 +00:00
Joshua McCloskey
2f46489926
Moving FingerprintSettings to Kotlin
...
This change is the first of many, it will
1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged
This change in particular is focused on transitions to and from various activities.
Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true
Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
Merged-In: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
2023-06-28 15:49:02 +00:00
Treehugger Robot
396653e8f3
Merge "[BiometricsV2] Fix intro overlap enrolling page"
2023-06-28 13:43:32 +00:00
Chaohui Wang
b17ef6f91e
Fix cursor is empty in ApnEditor
...
If cursor.moveToFirst() returns false, the cursor is empty which cause
crash.
Check whether the curse is empty to fix.
Fix: 288716180
Test: manual - on ApnEditor page
Test: m RunSettingsRoboTests
Change-Id: If850cd3feca3d3d520a653c2490d1049a8a87fdc
2023-06-28 19:31:46 +08:00
SongFerng Wang
c123b2e5a8
Revert "Update the wording for LE Audio"
...
This reverts commit f4c5c8ef5e
.
Reason for revert: at stage3, removing this summary.
Bug: 289184862
Change-Id: I6b18a7e2dee9d8fcfb331e53d7a57cc43574da54
2023-06-28 10:06:59 +00:00
Chaohui Wang
63eddc12dd
Refactor FeatureFactory
...
Not use reflection, sets the FeatureFactoryImpl in SettingsApplication
instead.
Bug: 286764889
Test: m Settings
Test: m SettingsSpaUnitTests
Test: m RunSettingsRoboTests
Change-Id: I881bf1009a94222fc89578d14a6792a6e1507be2
2023-06-28 09:09:39 +00:00
Zoey Chen
ab029e44f5
[Regional Preference] Add content descripiton to the img for Talkback
...
Test: manual
Bug: 289176529
Change-Id: Iaa7e6d8fca1036be58ea5bb17e722935f5f9f424
2023-06-28 08:31:12 +00:00
Allen Su
e93f6cd9e6
[Panlingual]Log metrics for App's locale from the suggested
...
Bug: 258128535
Test: atest AppLocalePickerActivityTest
Change-Id: I007c0e76d8b88f08518ba2696d42bd1db194f5b7
2023-06-28 08:24:10 +00:00
Shawn Lin
a2e032bb8e
Fix lock pattern is truncated during SUW in folded state
...
Remove the bottom margin of the header view.
Bug: 285290323
Test: 1. Go through SUW
2. Select lock pattern
3. Check if UI truncated
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
com.android.settings.password.SetupChooseLockPatternTest
Change-Id: I48ac3d897e6b876bd7a1c325cc4a5e797e140da2
2023-06-28 06:52:40 +00:00
Milton Wu
570b23e0a0
[BiometricsV2] Fix intro overlap enrolling page
...
Fix fragment overlapped if user rotates device on findSensor page, then
enter enrolling page and back again.
It is because the flag isFirstFragmentAdded is not saved and restored
after activity recreated
Bug: 288212767
Test: atest FingerprintEnrollmentActivityTest
Test: atest FingerprintEnrollmentViewModelTest
Test: atest biometrics-enrollment-test
Test: Manually test this scenario
Change-Id: I5b582582d97caac2488b787f551c50abec9f810c
2023-06-28 13:28:44 +08:00
Yanting Yang
a09fd45249
Merge "Support the about device warning message for tablets"
2023-06-28 03:57:08 +00:00
Yanting Yang
0818b82ecf
Support the about device warning message for tablets
...
Move the related strings to res-product folder and add the string for
tablet.
Bug: 282233849
Test: visual
Change-Id: Ib93fd1a3e15600bd2278297645dadd176d99a083
2023-06-28 02:28:34 +00:00
Yuyang Huang
f79e084bd0
Enable/Disable ASHA profile with LE audio toggle
...
LE audio has more capability and better quality than ASHA has. When LE audio turned on, ASHA should be off to avoid media streaming profile conflict.
Bug: 287525854
Change-Id: I3c5c9012c167b920e484b39374fe8174191b094d
Test: manual
2023-06-27 23:32:06 +00:00
Treehugger Robot
4dd2e56ddf
Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev am: 6b01e66545
am: fac986e071
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783056
Change-Id: I31ce5d4e828d51c0d73711e3615ea1515edc30d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 18:55:55 +00:00
Treehugger Robot
fac986e071
Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev am: 6b01e66545
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783056
Change-Id: I15eb02f35ba2bad14edd6ef00374216aa8b5b4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 18:07:37 +00:00
Hao Dong
7b99d92464
Fix pattern rotation header text.
...
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
Merged-In: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
2023-06-27 17:50:15 +00:00
Hao Dong
2ca3f3232c
Fix Fingerprint enrollment UI when display size is largest.
...
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java
Test: manual test - 1. Set system display and font size largest
2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
Merged-In: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-06-27 17:48:16 +00:00
Michael Mikhail
7c9958aafd
Trigger talkback for notification volume change
...
Triggers talkback to say the content description of the title of
notification volume when notification volume is set to vibrate or silent
mode.
Fixes: 285453719
Fixes: 285455826
Test: manually checked when the ring volume is set to 0% and when the
notification volume is set to 0%. Check the video in the bug link.
Change-Id: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
2023-06-27 17:42:11 +00:00
Treehugger Robot
6b01e66545
Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev
2023-06-27 17:35:26 +00:00
Michael Mikhail
2f393303c9
Add content description to volume title in settings.
...
Adds content description that is announced by talkback when a11y focus
is on volume preference. This improves talkback announcement when view changes.
Fixes: 285529113
Bug: 285455826
Fixes: 285487766
Test: atest VolumeSeekBarPreferenceControllerTest
Test: atest VolumeSeekBarPreferenceTest
Change-Id: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
2023-06-27 17:32:01 +00:00