Sally Yuen
6d6736c1c9
Merge "Update Extra dim banner for tablets" into tm-qpr-dev
2023-03-21 16:33:06 +00:00
Jason Hsu
8f565dda10
Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162
Change-Id: I3bfe7886f3dee0407faa357cb3cae58e1914ee9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 13:00:04 +00:00
Jason Hsu
e5ce1ad6e1
Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143
Change-Id: If14fcbfa4efa74e7551d192891033fe71ba1e371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 12:57:08 +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
7076cbc015
[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: I0dfc40b29a7a35f18f6bcffd22fb421c6ad9c230
Merged-In: I4405b3b7e832b71b9ef66fa71d9e42ce12da167c
2023-03-21 11:03:27 +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
4b43e0b716
Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175
Change-Id: Ic88a092c01d1f0441615287485d5e0f4aef85c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 09:27:18 +00: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
Daniel Norman
81f1b7833c
Update Settings animation to use new slide style when in SUW.
...
Bug: 273722905
Test: Launch SUW, click on Vision settings, click on subpages;
Observe slide animation matches guideline doc.
Change-Id: Id5ccffadbd77aeb5cacd6eee071a8dc1f2b46acf
2023-03-20 21:42:21 +00:00
Kweku Adams
b4240202a2
Merge "Remove RESTRICTED bucket off code." into udc-dev am: f0c3812123
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22075586
Change-Id: Ia744ebcc0d85494ab0febe288100f2fcc3a05be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 16:56:31 +00:00
Chaohui Wang
989a724787
Merge "Fix not displaying "Allow restricted settings"" into udc-dev am: ac67b77af7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135265
Change-Id: I7b281c53b97a79eefe16b6716f6e64f5d1f46c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 16:43:43 +00:00
Becca Hughes
241b14fd9b
Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911122
Change-Id: I43db1cde7fc891ac9b1496d2d5b88bd5c044bb80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 16:31:22 +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
36df8ad640
Merge changes I26c7d64e,I7ec6d824 into udc-dev am: 1c47f309af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22120466
Change-Id: I819946d6d420cb23f537a073dfb8f2eb60b222dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 15:10:28 +00:00
Julia Reynolds
f448aec29d
Merge "Add missing conversation field" into udc-dev am: 2494fd0187
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257
Change-Id: I3fdd62e92426653320aa8c492130d9be41f604b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 15:09:18 +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
jasonwshsu
06adc71b89
Extract duplicate part for hearing audio routing into SettingsLib
...
Similar functions need to be called when hearing device get connected, so move them into SettingsLib.
Bug: 269122580
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingDeviceAudioRoutingBasePreferenceControllerTest
Change-Id: I15296fb81726c96c1d2fec7397e981e71e305450
2023-03-20 21:11:14 +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
226ba1bfc1
[automerger skipped] Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
am: 00a7d0788f
am: aa7ec2d5fe
-s ours am: 8170de078c
-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: I89ead8dee737c81f39c638054f8de66aec4689a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 11:26:24 +00: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
08eea0993e
Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev am: 7a492b4098
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135681
Change-Id: I81549c19fffa32e95b506bf5d6df8166800db21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 11:04:39 +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
1ef40e5503
Merge "Modify the log at AutoSelectPreferenceController" into udc-dev am: d687c01745
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122899
Change-Id: Ic8f886b6e0d8aece70f36f423b2c56fd12e4d2f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 10:44:38 +00:00
SongFerng Wang
e3bcf8a199
[automerger skipped] Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb
am: 782bb2f069
-s ours am: 866c7e17f8
-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: Ic40515e5c4acae8c29660152255e9cf633de3938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 10:44:29 +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
ee536e004c
[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: 9a40a296cc
-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: Ibcec14b1fdaa8f859958a499932ec6dcee4f7ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 08:53:00 +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
Zoey Chen
4a3d0d7f8e
Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522
Change-Id: I52941b212917464a6489dcd2bf782bcb0f6e3519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 07:19:45 +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