Jason Hsu
72237b55f8
Merge "Correct the char limit for strings" into udc-dev
2023-03-22 17:32:55 +00:00
jasonwshsu
e621a54f0a
Correct the char limit for strings
...
* string: bluetooth_system_sounds_title is too long to fit in one line.
Should allow more char limit to two lines.
Bug: 270086620
Test: flash rom and check UI
Change-Id: I8b0c8ca37fc3b7447da3dba3bca66673b4d05f7a
2023-03-23 01:25:19 +08:00
Wu Ahan
2034c0c395
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f
am: 0067e9581b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: I19a4ecd726bf1e6b059909fcb274f2d2cc080fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 14:02:36 +00:00
Wu Ahan
0067e9581b
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: Ibe03950c9d6e02ebd641e93df2cb5cb646dbfb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 13:44:52 +00:00
TreeHugger Robot
a311ae81fc
Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev
2023-03-22 11:40:57 +00:00
Josh Hou
b1f9d26174
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into udc-dev
2023-03-22 05:14:47 +00:00
Wu Ahan
3a2ef6db2f
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev
2023-03-22 03:46:30 +00:00
Milton Wu
cdaf1091d1
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
am: 544feb9013
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I748aafeb257bfc6325f5e3a0ef724dbd0e36d697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 01:33:58 +00:00
Milton Wu
544feb9013
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I1a80e569626469eaca583007ee94fb77bf36f03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 00:57:38 +00:00
Milton Wu
1d68fbf007
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev
2023-03-22 00:26:50 +00:00
lbill
c7dd729a43
Launch Face Settings when device enrolled face
...
In legacy flow FaceEnrollIntroduction check maxFacesEnrolled()
then update introduction description and prevent user go to next
enroll step, the CUJ was not good to user, instead bring user
to Face Settings and let user decide the next action(Delete face or
change config) is more make sense.
As any applications could broadcast intent(android.settings.FACE_ENROLL)
to bring FaceEnrollIntroduction up, we add a check in onCreate() and check
if device has been enrolled max face, launch FaceSettingsInternalActivity.
In addition, skip to register any posture change callback when
maxFacesEnrolled() during activity onStart().
Test: atest SettingsGoogleUnitTests
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"FaceEnrollIntroductionTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"FingerprintEnrollIntroductionTest"
Test: Manual enrolled face, unfold device, launch Tips Security page
and click "Set up Face Unlock", device launch Face Settings insteand of
posture guidance page.
Bug: 263830403
Change-Id: Ied8b92259810f954ce6b2daaa9b87fc996ad752a
2023-03-21 19:10:57 +00:00
Sally Yuen
40019f876b
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
am: 1795481a72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: Ib68b4ee9ecbd90f565eb57ceed0e8d2eb445864a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 18:24:43 +00:00
Sally Yuen
1795481a72
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: I781c0e19683127e794d63949979b1b5a2eb2ff4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 17:46:07 +00:00
Sally Yuen
6d6736c1c9
Merge "Update Extra dim banner for tablets" into tm-qpr-dev
2023-03-21 16:33:06 +00:00
Jason Hsu
bff222ca71
Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev
2023-03-21 11:39:44 +00:00
Jason Hsu
b25a941609
Merge "Update to use android:summary="%s" in ListPreference" into udc-dev
2023-03-21 11:38:02 +00:00
Josh Hou
38df174bba
[Panlingual] Can't set per-app languages for apps on work profile page
...
Use startActivityAsUser instead of startActivity API to start the AppLocalePickerActivity of different users
Bug: 274378136
Test: 1. Perform AppLocalePickerActivityTest robolectric test
2. Perform the manual test by switching different users
3. Perform the manual test by switching different profiles
Change-Id: I4405b3b7e832b71b9ef66fa71d9e42ce12da167c
2023-03-21 10:57:42 +00:00
Matías Hernández
07394b0fdc
Fix icons of DND timelapse/event schedule types in Dark Mode
...
Instead of a fixed white color, use a theme-dependent one. Also renamed the drawables themselves since they are no longer "_white".
Fixes: 214789556
Test: Manual
Change-Id: I94d7d0308a339385988d3bb39182b2e2d2f0c3a1
2023-03-21 11:56:16 +01:00
Angela Wang
6dfcad2cb2
Merge "Adds illustration to Flash Notifications settings page" into udc-dev
2023-03-21 08:44:04 +00:00
jasonwshsu
fd76efc7fd
Update the strings for bluetooth hearing device details page in U
...
Bug: 270086620
Test: flash rom and check the device details page UI for hearing device
Change-Id: Iae1a7fae9f51ed8318d757ed7b3eefe0261b28a1
2023-03-21 15:10:38 +08:00
Ahan Wu
ae84ac3530
Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment
...
1. Use GlifLayout#setDescriptionText to align UX.
2. Remove redundant layout resources.
3. Add two new robotests.
Bug: 236948821
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SetupChooseLockGenericTest
Test: Check UI manually
Change-Id: I85cc984527fcc746e835d8fa508e78c96dfdcb94
2023-03-21 06:27:51 +00:00
Angela Wang
139ee5037b
Adds illustration to Flash Notifications settings page
...
Bug: 274546785
Test: builds and checks the illustration manually
Change-Id: Iaaa49195fc062b2905b148352a5bd3e25807f207
2023-03-21 05:11:45 +00:00
Kweku Adams
f0c3812123
Merge "Remove RESTRICTED bucket off code." into udc-dev
2023-03-20 16:13:49 +00:00
Chaohui Wang
ac67b77af7
Merge "Fix not displaying "Allow restricted settings"" into udc-dev
2023-03-20 16:03:47 +00:00
Becca Hughes
853c4a8683
Merge "Add subtitle to settings (settings)" into udc-dev
2023-03-20 16:01:08 +00:00
Zoey Chen
1c47f309af
Merge changes I26c7d64e,I7ec6d824 into udc-dev
...
* changes:
[Settings] update the db list when back to UI
[Settings] Fix the inconsistent data/entity when switch the app/fragment
2023-03-20 14:53:54 +00:00
Julia Reynolds
2494fd0187
Merge "Add missing conversation field" into udc-dev
2023-03-20 14:28:41 +00:00
jasonwshsu
6c3805288b
Update to use android:summary="%s" in ListPreference
...
* No need to call updateState() in onPreferenceChange()
Bug: 274326713
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(AccessibilityButtonGesturePreferenceControllerTest|CaptioningLocalePreferenceControllerTest|CaptioningFontSizeControllerTest|CaptioningTypefaceControllerTest|AccessibilityButtonLocationPreferenceControllerTest|FloatingMenuSizePreferenceControllerTest|SelectLongPressTimeoutPreferenceControllerTest)"
Change-Id: I14a87597a44c5500ff7e676664b67feb9c352494
2023-03-20 21:24:02 +08:00
Julia Reynolds
5164149efc
Add missing conversation field
...
NotificationChannel#EDIT_CONVERSATION should show
both 'demote conversation' and 'promote conversation'
fields.
Test: View Partial and Full Settings for promoted and
demoted channels
Fixes: 273508155
Change-Id: I4a17a73d695d7c79837fc647b79968f535fa4393
2023-03-20 13:04:11 +00:00
Chaohui Wang
90983daa41
Fix not displaying "Allow restricted settings"
...
"Allow restricted settings" is missed from SPA, added to SPA to fix this
issue.
Also make the system call in app info more options async to improve
performance.
Fix: 273678047
Test: Unit test
Test: By the following steps,
1. Install an app with accessibility feature from Chrome
2. Go Accessibility page and click on the disabled grey app
3. Go to the app info page, click more options
4. Make sure "Allow restricted settings" is displayed
Change-Id: I4adbe2335a32e6a7c4ebe155715684d768e5d1ef
2023-03-20 19:40:06 +08:00
Betty Chang
8170de078c
[automerger skipped] Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
am: 00a7d0788f
am: aa7ec2d5fe
-s ours
...
am skip reason: Merged-In Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2 with SHA-1 74dc069d16
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497
Change-Id: Ibda82b86ecec145866e0267b689841f53292ba25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 11:12:57 +00:00
Zoey Chen
7a492b4098
Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev
2023-03-20 10:45:34 +00:00
SongFerng Wang
d687c01745
Merge "Modify the log at AutoSelectPreferenceController" into udc-dev
2023-03-20 10:43:33 +00:00
Betty Chang
aa7ec2d5fe
Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
am: 00a7d0788f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497
Change-Id: I7f299924d39ddc0952b301e622e4009064e923f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 10:29:38 +00:00
SongFerng Wang
866c7e17f8
[automerger skipped] Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb
am: 782bb2f069
-s ours
...
am skip reason: Merged-In I81a597f28cf7ce25ff4eff5100bdb4d29c897a14 with SHA-1 7b9c22348a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268
Change-Id: If26f2822421623142391f3328d5ebd26097ae82b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 10:05:32 +00:00
Betty Chang
00a7d0788f
Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497
Change-Id: I5ea028e5cab8a83b445d5590f0ae9f3965fb8e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 09:53:01 +00:00
SongFerng Wang
782bb2f069
Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268
Change-Id: Ideef6fbd4bd904456cb2b91207f8e2acdf54637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 09:29:21 +00:00
Betty Chang
9541363952
Merge "[LE Audio] Set activity for result after scanning the QR code"
2023-03-20 09:28:31 +00:00
Zoey Chen
cb4e0bd018
[Settings] Should not show WFC UI in the SIM page if the SIM does not
...
support WFC
Bug: 270792637
Test: manual
Change-Id: Ic67bd2e766d66c91fc4b0fcf5a5355debd805ac6
2023-03-20 09:15:55 +00:00
Zoey Chen
db02f10b07
[Settings] update the db list when back to UI
...
Bug: 271524675
Test: local test
Change-Id: I26c7d64e6f040c62c9efb1438efe328f5744fa02
2023-03-20 09:08:34 +00:00
Zoey Chen
b9f6bb7958
[Settings] Fix the inconsistent data/entity when switch the app/fragment
...
Bug: 271524675
Bug: 273825889
Test: local test
Change-Id: I7ec6d824c5154422aaad056dc3f4dcd365fef5e1
2023-03-20 09:04:24 +00:00
SongFerng Wang
d911a095eb
Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev
2023-03-20 08:59:12 +00:00
Betty Chang
9a40a296cc
[automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
am: 1de44c2447
am: 0fd1625895
-s ours
...
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I0886a26aba0650bc1699878e30ffb17ebbd3a3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 08:13:47 +00:00
Betty Chang
0fd1625895
Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
am: 1de44c2447
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I704c81ac2d045142be5c7cc1835efa6d46cd2930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 07:35:52 +00:00
Betty Chang
1de44c2447
Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I3747bf58a841c0c0213d6b27525d9aee992f85bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 06:59:18 +00:00
changbetty
7cf90fbe36
[LE Audio] Set activity for result after scanning the QR code
...
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
Merged-In: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
2023-03-20 06:48:36 +00:00
SongFerngWang
c678caba4a
Modify the log at AutoSelectPreferenceController
...
Bug: 270652395
Test: build pass
Change-Id: I3b9611fd3704d0965ace12f2bb13c28ace60eadf
2023-03-20 14:48:16 +08:00
Zoey Chen
ce77de4240
Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev
2023-03-20 06:43:23 +00:00
SongFerngWang
88717f2c3f
Avoid ANR when UI query network selection state
...
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.
Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Merged-In: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
Merged-In: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
Change-Id: Ifb548de301021f992ef13c3d299de1642f379fbf
2023-03-20 14:42:18 +08:00
Betty Chang
18eb985e41
Merge "[LE Audio] To remove the broadcast source item that created by receive state"
2023-03-20 06:33:42 +00:00