Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,404 Commits 1 Branch 0 Tags
abe4bb12767db22aa6a07215325d3ceaf449cb53
Commit Graph

1555 Commits

Author SHA1 Message Date
Treehugger Robot
b15719119e Merge "Use system properties for the le audio toggle ui config instead" into udc-qpr-dev am: 2d7a469264 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24768698

Change-Id: Ie138a425906541eb2bc8f1c08a8956636363a141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 07:05:06 +00:00
Treehugger Robot
2d7a469264 Merge "Use system properties for the le audio toggle ui config instead" into udc-qpr-dev 2023-09-19 06:31:29 +00:00
Guojing Yuan
cf705cf873 [CDM Perm Sync] Fix a NPE for Perm Sync toggle am: 8c51d9c71d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24790419

Change-Id: I8cdf0fb8b740ffd32fac9c01aa0d4dfa51904b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-18 22:20:37 +00:00
Guojing Yuan
8c51d9c71d [CDM Perm Sync] Fix a NPE for Perm Sync toggle 
Bug: 290063372

Test: manual test on the breaking build.
Change-Id: I1f0a5c3840a4c97962fa9986d8f67ab0f652015f
 2023-09-18 18:44:10 +00:00
Alice Kuo
aa734eb52a Use system properties for the le audio toggle ui config instead 
Config LE audio UI per devices. Change to use system properties instead

Bug: 300807171
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: Id0d624f516b9fdbe2380e5f10da5c69b08eea6a4
 2023-09-18 03:05:59 +00:00
Guojing Yuan
e0cce7bf6a Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev am: d43d6f259a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24708184

Change-Id: I3c29e5b9a46695e5c21a837e00891cc22e0bff4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 21:49:46 +00:00
Guojing Yuan
5f86e8ff03 [CDM] Add Permissions Sync toggle 
Bug: 290063372

Test: manually tested the toggle
Change-Id: I75d4370eed98275e2f99d65620229bdb57193fb8
Merged-In: I75d4370eed98275e2f99d65620229bdb57193fb8
 2023-09-15 18:05:37 +00:00
Yuanru Qian
ea691aca93 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I1a0c3b36915a42588aafdeaa41eca6fd57889350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 17:43:15 +00:00
Yuanru Qian
22a947a156 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I0710a54b97a9b230c8802326687d76be7d7a51f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 17:04:28 +00:00
Yuanru Qian
81343f23fc Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I366f3dddb68df63b2ae251e71610c4d1e33ceefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 15:21:52 +00:00
Yuanru Qian
8ffc3c728d Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS 
Change-Id: I29c44aec3a9065dd9e0c207faaea55da6ad21471
 2023-09-12 07:39:43 +00:00
Treehugger Robot
e4d9d80f15 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 am: ed9bbf31c9 am: c9e0efd5ba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Ib944ab2e79ea349791e83a2dc7639920ac76245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 15:38:17 +00:00
Treehugger Robot
c9e0efd5ba Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 am: ed9bbf31c9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: I6861bf65677a4d451b53b81993d262230739e482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 15:00:12 +00:00
Treehugger Robot
9c21429af4 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Idca058c3f3d2de4324d51c9bfd0225cd44c2dbf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 13:15:08 +00:00
Jin Dong
a1ae2b1e93 Limit bluetooth broadcast password to single byte characters 
The bluetooth broadcast password is supposed to be single byte
characters, so crash hanppened when input too many double-byte
characters when connecting to other broadcast.
Limit the password to single byte characters to fix this issue.

Bug: 297840479
Test: Manual
Change-Id: Ifab89ee9a07f20d1f30aba17bed694b5a5da8480
 2023-09-04 08:14:10 +00:00
Vlad Popa
4ee43c40e9 Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24531690

Change-Id: I134714c9a5cb03c06d6dbee2256d7630554c37c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 00:44:41 +00:00
Vlad Popa
5175cdc2f5 Disable the spatializer options for device categories 
If the BT device cannot be of category headphones do not show the
spatializer options.

Test: manual & atest BluetoothDetailsSpatialAudioControllerTest
Bug: 297265575
Merged-In: I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e
Change-Id: I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e
 2023-08-31 09:48:49 -07:00
Vlad Popa
b3c3c72502 Merge "Add hearing aid as a BT audio type" into udc-qpr-dev am: be8b899e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24518074

Change-Id: I72ee6be4d775a7e0443cf1f4cf3f80b84bbfcdb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 15:59:32 +00:00
Vlad Popa
320fc882e9 Add hearing aid as a BT audio type 
Test: manual
Bug: 287011781
Change-Id: I33786c5f3a055de3652aac79e839549f13d26843
 2023-08-22 16:55:37 -07:00
Vlad Popa
dc5fd85f24 Merge "Add list preference for BT audio device type selection" into udc-qpr-dev am: 3bf2649386 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24396815

Change-Id: I55438a3dc1368de726a86ef2280a2d8424d33113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 17:17:17 +00:00
Vlad Popa
0e23c4d41f Add list preference for BT audio device type selection 
Since BT devices do not populate the device type reliably we offer the
user the possibility to categorize the audio type of the selected
device. This is can be used by the AudioManager for enabling/disabling
the computation of sound dose.

Test: atest BluetoothDetailsAudioDeviceTypeControllerTest
Bug: 287011781

Merged-In: I797a92e1af4025596ef1c603ed4ab59813e3cbf0
Change-Id: I797a92e1af4025596ef1c603ed4ab59813e3cbf0
 2023-08-11 00:25:12 +00:00
Yuyang Huang
325cd61f8c Merge "Enable/Disable ASHA profile with LE audio toggle" into udc-qpr-dev am: b40e5c2228 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23919023

Change-Id: I024ffb878311a911b6acd93c77f4136fed2e912b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 23:05:35 +00:00
Yuyang Huang
b40e5c2228 Merge "Enable/Disable ASHA profile with LE audio toggle" into udc-qpr-dev 2023-08-03 22:20:35 +00:00
SongFerng Wang
b93774ab40 Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278

Change-Id: I017d432a9abe3f141436f185c156838b393d3d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 11:39:35 +00:00
SongFerng Wang
b2c60799af Merge "Fix testcase failed" into udc-qpr-dev 2023-08-01 10:55:39 +00:00
SongFerngWang
7cbfe4a10e Fix testcase failed 
Bug: 292979979
Test: [Pass]make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDeviceDetailsFragmentTest
Change-Id: If09f4d8ad9c974c2a7f72932d544490655b92cf7
 2023-07-26 17:54:20 +08:00
Angela Wang
2768bbd241 Merge "Show connecting hearing devices in A11y hearing devices page" into udc-qpr-dev am: 8a373a5b14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659918

Change-Id: I705310a82badd1b9a389fe78402db607b669ffff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:25:14 +00:00
Angela Wang
653ff8a485 Show connecting hearing devices in A11y hearing devices page 
We only show connected hearing devices in the hearing devices page now.
When user pairing a device from pairing page and back to the hearing
devices page after the device is bonded, it's confusing no device shown
in the list because the device is still connecting to profiles. We
should show the connecting device to avoid confusion.

Bug: 283268686
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableHearingDeviceUpdaterTest
Change-Id: Id3b29c12b80c282736a3e6ca73bcf317e0652b89
Merged-In: Id3b29c12b80c282736a3e6ca73bcf317e0652b89
 2023-07-19 06:29:11 +00:00
Treehugger Robot
f07e5f7520 Merge "Show LE audio toggle in Device Detail by default" into udc-qpr-dev am: 2fdc9c943b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002323

Change-Id: I7006714cd6b249f8dc791703c3daaddb0ade2f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 03:42:18 +00:00
Treehugger Robot
2fdc9c943b Merge "Show LE audio toggle in Device Detail by default" into udc-qpr-dev 2023-07-17 03:34:51 +00:00
Chaohui Wang
9e62a492f4 Merge "[BT] Correct the filter when addCachedDevices" into udc-qpr-dev am: 683296f180 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025004

Change-Id: I342823c900601345cd622bf7e0b0aab0879b9799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 03:18:43 +00:00
Chaohui Wang
512caa568a [BT] Correct the filter when addCachedDevices 
In Change Ia9750adb6b4c1424d084381e9d7c2ca8e7912391, addCachedDevices()
becomes async, but the filter is set outside of addCachedDevices(),
which makes the filter not apply to addCachedDevices().

Direct pass the filter to addCachedDevices() to fix this issue.

Also migrate the test to Kotlin so we can test coroutine.

Fix: 289876965
Test: manual - check BT pairing page
Test: m RunSettingsRoboTests
Change-Id: I95b16840881747ec9f69e5cd778e456bcc8a7626
(cherry picked from commit 8dd32ab07d)
Merged-In: I95b16840881747ec9f69e5cd778e456bcc8a7626
 2023-07-14 05:40:03 +00:00
SongFerng Wang
340d592bbf Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev am: 997ef1e5b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018266

Change-Id: Iac910dd53cfa1ee4b67548d7cfd025c6809a88e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 14:14:27 +00:00
SongFerng Wang
997ef1e5b3 Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev 2023-07-11 13:33:14 +00:00
SongFerng Wang
513f38cb17 Revert "Revert "Update the wording for LE Audio"" 
This reverts commit c123b2e5a8.

Reason for revert: Since the phase 2 launch plan was moved to next timeline at b/289884263.

Change-Id: I54ff20c0d9599da7f47e2254f721be6007a9204a
 2023-07-11 08:20:23 +00:00
Patty Huang
698ce52a17 Show LE audio toggle in Device Detail by default 
Bug: 289884263
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Test: Checks the LE Audio toggle is shown in Device Detail by default
Change-Id: I3affeebd9b2c59d24f4eaa76a1a22a714e968976
 2023-07-10 11:05:35 +08:00
Treehugger Robot
07678daaf7 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 20b82c3646 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I302b91cd8502cca57a28e74cbbf72cf962d6468f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 11:21:28 +00:00
Treehugger Robot
5da1b03545 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I2398f07f2f4936ab26a59a2df285ea3dae05bb94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 10:42:29 +00:00
Treehugger Robot
20b82c3646 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I3536f29c771b9233790e6852ab6dc4cb0b58b531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-07 10:38:02 +00:00
Yuyang Huang
83e5cd004f 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
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f79e084bd0a3f9cd332d8218ac040d8c6c60f658)
Merged-In: I3c5c9012c167b920e484b39374fe8174191b094d
Change-Id: I3c5c9012c167b920e484b39374fe8174191b094d
 2023-07-06 17:43:20 +00:00
Patty Huang
627a584f39 Do not show LE audio toggle in Device Detail by default 
Bug: 289884263
Bug: 289957406

Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Test: Checks the LE Audio toggle is not shown in Device Detail by default
Change-Id: I2c6430c791dd852d238d7122a72f218f395c4a0b
 2023-07-05 11:51:50 +08:00
SongFerng Wang
4b970a47ec Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev am: 73c811b289 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844564

Change-Id: I3890bf56ae360167ab88442c444a49d438edc8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-29 03:15:08 +00: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
Treehugger Robot
f75356ca21 Merge "Stop the searching of broadcast" into udc-qpr-dev am: c97fe1a27f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23744199

Change-Id: I74132b143b5312886d27ddf6f8e5eb3bb74ce9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-25 18:52:19 +00:00
SongFerngWang
dbe58e96dc Stop the searching of broadcast 
- When the user leaves the page, stop the searching
- After the buds are added into broadcast, then stop the searching
Bug: 287136134
Test: build pass. manually testing

Change-Id: I305a9c6ba8cca1bd5c3c0e1d78ad4a84f9a155b7
 2023-06-20 11:33:45 +00:00
Chaohui Wang
8429e8cc79 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 am: 6bceb29408 am: c1f06b5e28 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: Ie6831edecd10cceb2cdf3e3d9ac242cdbd462dd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 12:05:27 +00:00
Chaohui Wang
c1f06b5e28 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 am: 6bceb29408 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I95132b6df6fe214a0bae54b9c7be69efa77292b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 11:28:16 +00:00
Chaohui Wang
6bceb29408 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I936a6e4a4f24a7f8c238662ec09a02f7a3e985e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 10:45:36 +00:00
Chaohui Wang
b1231c5f15 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I9e87eec0995e9dde010a51e3a7ccbaf68839a696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:56:38 +00:00
Chaohui Wang
d7147fd952 [LE Broadcast] Fix crash when scan QR code am: c91d017080 am: fd264a7696 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065

Change-Id: Ica82921f80d6c5d796974d34d9a0e710e38eddf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 07:44:49 +00:00