Commit Graph

682 Commits

Author SHA1 Message Date
Yiyi Shen
3cdd111ed3 [Audiosharing] Add toggle to improve sharing compatibility.
Test: manual
Bug: 305620450
Bug: 292538935
Change-Id: I8df92323c606cc3375a0f985d46c11caa12c6cfe
2024-01-16 17:20:05 +08:00
Yiyi Shen
a05c1e5283 Merge "[Audiosharing] Always show broadcast name when BT is on." into main 2024-01-16 07:51:05 +00:00
Yiyi Shen
162533362a [Audiosharing] Always show broadcast name when BT is on.
Also group the broadcast name to Stream settings category.

Test: manual
Bug: 305620450
Change-Id: I12bba9d5199d6770f86dad1089b47c3767285573
2024-01-16 14:54:10 +08:00
Angela Wang
3e9f1ff659 New hearing device pairing page (1/2)
Rewrite a new hearing device pairing page with update UI for "See more
devices".

Bug: 307473972
Test: atest HearingDevicePairingFragmentTest
Test: flip the flag com.android.settings.flags.new_hearing_device_pairing_page && atest HearingAidPairingDialogFragmentTest AddDevicePreferenceControllerTest
Change-Id: Ic60601905e3d0d7d7c5b1ef9733652118a211f1d
2024-01-16 03:49:34 +00:00
chelseahao
5d0bd7555d [Audiosharing] Handle sync, add source via qrcode.
Bug: 305620450
Test: manual
Change-Id: I32c14607035d8f37f44186175657c42307780e7b
2024-01-15 10:27:25 +00:00
Yiyi Shen
4af5178f57 [Audiosharing] Support play test sound
Test: manual
Bug: 305620450
Change-Id: Id3f3b99f94a8a91d76fb9442310789b87c39bca0
2024-01-12 16:54:18 +08:00
Yiyi Shen
389ab6a6ef [Audiosharing] Update the volume control registration flow.
Based on the framework API redesign, we will start/stop the volume control callback registration when user enter/leave the volume control page.
We will temporarily keep a map of the device to volume map and use the
volume value to set the initial state of the volume progress bar if it is valid.
If the volume value is null or invalid, we will read the music stream
volume from the audio manager to set the initial state.

Test: manual
Bug: 305620450
Change-Id: Iee3fba39af388782ac3498cb1610b248ced22c3c
2024-01-12 06:35:24 +00:00
Yiyi Shen
180a686af0 Merge "[Audiosharing] Skip active device switch" into main 2024-01-10 12:11:38 +00:00
Yiyi Shen
9f60c22fad [Audiosharing] Skip active device switch
For framework investigation on the handover issue.

Test: manual
Bug: 305620450
Change-Id: I84f87feac4b72f54eaa1f59ff5524b887bfd00f1
2024-01-10 19:22:11 +08:00
Sunny Shao
bee65b4109 Merge "Revert^2 "Nullability Annotations replacement"" into main 2024-01-10 08:35:06 +00:00
Sunny Shao
076ed573eb Revert^2 "Nullability Annotations replacement"
This reverts commit 19d1d3d15d.

Reason for revert: revert it because this is not the root cause.

bug: 316867690
Change-Id: I0f168dbb64044aa720202af7b1040afd4f028c9c
2024-01-10 07:34:01 +00:00
Sunny Shao
19d1d3d15d Revert "Nullability Annotations replacement"
This reverts commit cf0501e4d7.

Reason for revert: b/317462033, it seems a flaky but revert it first.

Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
2023-12-29 02:28:24 +00:00
Jan Tomljanovic
db40deb26f Require authentication for changing USB preferences.
Test: atest SettingsRoboTests
Test: also tested manually
Bug: 317367746
Change-Id: I17daaad7c7772664cae6d12cf2322991827f33bb
2023-12-22 15:18:05 +00:00
sunnyshao
cf0501e4d7 Nullability Annotations replacement
-- Replace the android.annotation.Nullable / android.annotation.NonNull
   with androidx.annotation.Nullable / androidx.annotation.NonNull

Bug: 316867690
Test: build pass
Change-Id: I0c1da55dfb09ece855151c47e0492d6f46538621
2023-12-20 08:50:09 +08:00
Yiyi Shen
ca6b0f7506 [Audiosharing] Use new API to start private broadcast.
Test: Manual
Bug: 305620450
Change-Id: I7607acdbc647c7c06969fda588ba159a8fb47ed0
2023-12-14 09:12:18 +00:00
Yiyi Shen
ced34f8672 Merge "[Audiosharing] Move time consuming work to background." into main 2023-12-14 07:30:55 +00:00
Yiyi Shen
6303736762 [Audiosharing] Move time consuming work to background.
Bug: 305620450
Test: manual
Change-Id: I9192d8ebbcd12d0bf13d0145d8a2e47cb8da5edd
2023-12-14 07:12:19 +00:00
Yiyi Shen
03a41e0e03 Merge "[Audiosharing] Update the media device based on assistant callback" into main 2023-12-14 05:35:13 +00:00
Chelsea Hao
d51a1dc4ca Merge "[Audiosharing] Set visibility by active device." into main 2023-12-14 03:27:35 +00:00
chelseahao
7edc93ec25 [Audiosharing] Set visibility by active device.
Also created header and button controller for detail page.

Bug: 305620450
Test: manual
Change-Id: I5e468a0fb9ce49ef0fd9a0b00b51084cfd416ce0
2023-12-13 19:10:12 +08:00
Yiyi Shen
bf6e273ccb [Audiosharing] Update the media device based on assistant callback
Bug: 305620450
Test: atest AvailableMediaDeviceGroupControllerTest
Change-Id: I7a19edb4e408c59ead553ec10fd9e963674518a6
2023-12-13 18:16:55 +08:00
Yiyi Shen
b107bfc9ac [Audiosharing] Fix volume control error display.
Avoid showing the volume control when the device is not acting as the
sharing source.

Bug: 305620450
Test: manual
Change-Id: I162681d5d0cd84d19c351dce8cfdf833734bbb1b
2023-12-13 17:31:49 +08:00
chelseahao
1bb099f872 [Audiosharing] Impl pwd dialog and detail page
Bug: 305620450
Test: manual

Change-Id: I2686aee4c3809c5f683a42b6440a5fd361e7be0b
2023-12-12 14:14:03 +08:00
Yiyi Shen
a51097d008 Merge "[Audiosharing] Add prefix to device list item text in adapter." into main 2023-12-12 05:36:54 +00:00
Chelsea Hao
920037db83 Merge "[Audiosharing] Implement add source by qrcode scan" into main 2023-12-08 09:43:39 +00:00
Yiyi Shen
ab3136a51d [Audiosharing] Add prefix to device list item text in adapter.
Bug: 305620450
Test: atest
Change-Id: Icd8f7032d9bcf1be133d6b3f4c165ca98e0dfa60
2023-12-08 17:07:34 +08:00
Yiyi Shen
79028d1c8f Merge "[Audiosharing] Refine sharing disconnect dialog." into main 2023-12-08 08:24:07 +00:00
Yiyi Shen
90844f3546 Merge "[Audiosharing] Refine sharing stop dialog." into main 2023-12-08 08:23:39 +00:00
Yiyi Shen
f8ccd2bda3 Merge "[Audiosharing] Refine main sharing dialog." into main 2023-12-08 08:13:24 +00:00
Yiyi Shen
4d130705c7 [Audiosharing] Refine sharing stop dialog.
Bug: 305620450
Test: atest AudioSharingStopDialogFragmentTest
Change-Id: I1593d1b18af23ffea0ccae0425ad848191b90e8b
2023-12-08 07:17:57 +00:00
Yiyi Shen
13d09c97b2 [Audiosharing] Refine main sharing dialog.
Bug: 305620450
Test: atest AudioSharingDialogFragmentTest
Change-Id: Icd9d7524b29bc3a37f27316107176b93510cc12c
2023-12-08 14:54:41 +08:00
Yiyi Shen
16b78546a1 [Audiosharing] Refine sharing disconnect dialog.
Bug: 305620450
Test: atest AudioSharingDisconnectDialogFragmentTest
Change-Id: I16507fc5424fcb4bfa977199e92f9728c5df69c6
2023-12-08 14:27:36 +08:00
Yiyi Shen
eeec2a708c Merge "[Audiosharing] Refine sharing join dialog." into main 2023-12-08 06:19:35 +00:00
Yiyi Shen
fb617e423e [Audiosharing] Refine sharing join dialog.
Bug: 305620450
Test: atest AudioSharingJoinDialogFragmentTest
Change-Id: I54001d254d5cfd0cd72ea1a115d71142b6e6ed47
2023-12-08 13:14:23 +08:00
chelseahao
541dac155a [Audiosharing] Implement add source by qrcode scan
Bug: 305620450
Test: manual
Change-Id: If09522b515649621000208285340736abba04b4d
2023-12-08 04:25:04 +00:00
chelseahao
b5cc84af39 [Audiosharing] Implement source add and remove.
Bug: 305620450
Test: manual
Change-Id: I0fdae9823f8673180755eb895ee3a664b2978328
2023-12-07 20:19:02 +08:00
Yiyi Shen
212c2b4724 Merge "[Audiosharing] Update media devices section." into main 2023-12-06 12:03:06 +00:00
Yiyi Shen
22e3f51784 [Audiosharing] Update media devices section.
1. Filter out the media devices in audio sharing from the section.
2. During the audio sharing, click the media device will lead to
   stopping the sharing.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: atest AvailableMediaBluetoothDeviceUpdaterTest.java
Change-Id: I0676fd5aa98e593c6a5458845fc1b1631a5a6698
2023-12-06 18:25:09 +08:00
Yiyi Shen
f56d706cea Merge "[Audiosharing] Only check the active state of lead device." into main 2023-12-06 08:08:43 +00:00
Chelsea Hao
1a7a4d24ab Merge "[Audiosharing] Start / stop broadcast scanning." into main 2023-12-06 03:00:49 +00:00
chelseahao
fdf67f0cfe [Audiosharing] Start / stop broadcast scanning.
Bug: 308368124
Test: Manual
Change-Id: I4dfedbd329172c790a901b0eabe5400303395072
2023-12-05 18:39:32 +08:00
Yiyi Shen
517ab6e040 [Audiosharing] Only check the active state of lead device.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: manual
Change-Id: I5db46fedbb15ac01f9ea70ba83246086241b25dd
2023-12-05 17:58:32 +08:00
Yiyi Shen
c36fe14ca8 [Audiosharing] Dismiss all dialogs before show a new one.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: manual
Change-Id: I9c3ed31185814b184c9591103636f495046ecd3c
2023-12-05 17:05:23 +08:00
Yiyi Shen
fe306a7fc2 Merge "[Audiosharing] Fix main sharing flow." into main 2023-12-05 05:09:49 +00:00
Yiyi Shen
87e6d6e32c [Audiosharing] Fix main sharing flow.
Fetch the active device before starting the sharing. Because once the
sharing is started, all devices connected will switch to inactive.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: manual
Change-Id: Ie287d1094fe40dbcb42c121ea79409fc48e0eec7
2023-12-04 18:37:32 +08:00
Yiyi Shen
afbd9d9894 [Audiosharing] Fix volume control.
1. Unregister the volume control callbacks in onDestroy
2. Reuse SeekBarPreference#setProgress
3. Fetch volume from AudioManager if got invalid volume from VC service.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: manual
Change-Id: Id63d1dbff4c3cbdeb91c2537d951c39e1a932220
2023-12-04 10:16:25 +00:00
chelseahao
1340427763 [Audiosharing] Send intent to the qr code scanner.
Bug: 308368124
Test: Manual
Change-Id: I45abe790caecc6eb86e4ada2827ed740a5ee6a46
2023-12-04 05:15:04 +00:00
Yiyi Shen
bc3a1fa31f [Audiosharing] Add feature gates as utils.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: manual
Change-Id: I022174b5b40300b46b7b8dd78c7cddf541ed2aec
2023-11-29 17:55:28 +08:00
Yiyi Shen
bdc870a4c1 [Audiosharing] Show/hide audio sharing settings based on BT state.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: atest
Change-Id: I1af8ae268194cfca8e03cc49151b68a25717e89a
2023-11-28 19:17:40 +08:00
Yiyi Shen
ae728039ac [Audiosharing] Enable/disable the main switch base on BT state.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I48bf0c6fb40ff629610e6e1a48e209fea44ebdde
2023-11-24 15:41:43 +08:00