Commit Graph

1555 Commits

Author SHA1 Message Date
Angela Wang
175c73b316 Redirect user to original pairing page from pair dialog
After pairing ASHA devices from "Hearing devices", the pair another
dialog will bring user to the "Connected devices" pairing page. We
should redirect user to "Hearing devices" pairing page if user is
pairing their devices from A11y hearing devices page.

Bug: 295713308
Test: atest HearingAidPairingDialogFragmentTest
Test: manually connect an ASHA device and check the redirect page
Change-Id: Ia18e53a85e2b21a17e7a843d8979917c8c468e09
2023-08-24 06:34:42 +00:00
Vlad Popa
0134421059 Merge "Do not show SA preference for device that do not support it" into main 2023-08-21 16:49:21 +00:00
Chaohui Wang
cc2133ba8e Clean up unused fields from EntityHeaderController
Bug: 295260929
Test: manual - on pages with header
Test: robo test
Change-Id: Icebd63dbb5d3d44b4b46d3bececb8b65b30b4883
2023-08-21 13:58:07 +08:00
Vlad Popa
6af54b3225 Do not show SA preference for device that do not support it
Checking the spatializer immersive level to determine whether to show or
not the spatial audio preference in bluetooth settings

Test: manual on cheetah and bluejay
Bug: 296636479
Change-Id: I2f113f6d66acd30fd25d05556b99407cbc280e0a
2023-08-18 16:21:46 -07:00
Vlad Popa
d32044a8c1 Merge "Add list preference for BT audio device type selection" into main 2023-08-11 00:21:56 +00:00
Vlad Popa
a145082250 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

Change-Id: I797a92e1af4025596ef1c603ed4ab59813e3cbf0
2023-08-10 15:20:52 -07:00
Haijie Hong
9186f375df Merge "Improve Bluetooth pairing dialog & contact sharing toggle" into main 2023-08-10 02:53:29 +00:00
Angela Wang
f6c3736352 Merge "Show binaural ASHA hearing aids addresses" into main 2023-08-10 00:50:16 +00:00
Chaohui Wang
8e2ae547d6 Clean up FeatureFactory.getFeature()
Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
2023-08-08 08:41:48 +00:00
Haijie Hong
21b075770e Improve Bluetooth pairing dialog & contact sharing toggle
Before change: https://screenshot.googleplex.com/Agr29KTvgptbsag
After change: https://screenshot.googleplex.com/ArjiavkFAFiuCTR

Bug: 274521434
Test: RunSettingsRoboTests
Change-Id: Ib896b70bc219de128b733b75249bf80e3389f221
2023-08-08 13:15:38 +08:00
Chaohui Wang
2541381259 Fix references to resources for Settings
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
2023-08-08 01:56:05 +00:00
Angela Wang
e4d7d5e352 Show binaural ASHA hearing aids addresses
The other ear device address is not displyed in device detail page. Show
2 addresses if the connected hearing aids is a binaural hearing aids.

Bug: 288284097
Test: connect a binaural hearing aids and check the addresses are displayed
Change-Id: I218e32f8d7dc1cf10fab0de906f2b44862ac357f
2023-08-04 10:48:12 +00:00
SongFerng Wang
f15c4c2fe5 Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af am: b93774ab40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278

Change-Id: If190cc993cf44254658d234289ad7b57dd8445dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 12:20:38 +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
14b419b100 Refactor for better readability of using different Bluetooth scanning
We rely on using `filter` is null or not to determine which type of
Bluetooth scanning method is going to be used (Classic of LE). Add a
variable to clearly indicate current scan type for better readibility.

Bug:289189853
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Change-Id: I85a26d61410367bd617a0194ba3bfe7ed1b03356
2023-07-19 10:11:08 +00:00
Chaohui Wang
80744abb37 Remove context from BluetoothFeatureProviderImpl
Which is not used.

Bug: 286764889
Test: m Settings
Change-Id: I3f82d53f667d9802585f67f0e028ca52114a055e
2023-07-19 15:14:44 +08: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
Angela Wang
14d35107e8 Merge "Show connecting hearing devices in A11y hearing devices page" into main 2023-07-19 03:19:25 +00:00
Angela Wang
940e02b807 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
2023-07-18 04:30:59 +00:00
Treehugger Robot
56a76c7038 Merge "Show LE audio toggle in Device Detail by default" into udc-qpr-dev am: 2fdc9c943b am: f07e5f7520
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002323

Change-Id: I642988621d5e208cf5acbab6e88ecd3fdae45e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 22:18:35 +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
Chaohui Wang
46075bf8f4 Merge "[BT] Correct the filter when addCachedDevices" into main 2023-07-12 02:40:29 +00:00
SongFerng Wang
5da5fb57cc Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev am: 997ef1e5b3 am: 340d592bbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018266

Change-Id: Ia48ceb51044166be7c09f3b241e181331c77d2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 14:43:40 +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
Chaohui Wang
8dd32ab07d [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
2023-07-11 19:30:04 +08: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
89889d73d4 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 20b82c3646 am: 07678daaf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I8d284b59c2d74a91e58d1e47eddc86f16ea5ed49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 12:05:39 +00: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
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
Yuyang Huang
de771725c4 Merge "Enable/Disable ASHA profile with LE audio toggle" 2023-06-30 18:16:28 +00: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
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
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