commit 4b2c4407153c0dced83c87a5abe0dc324570b21b
author Yiyi Shen <yiyishen@google.com> Wed Nov 22 18:27:06 2023 +0800
committer Yiyi Shen <yiyishen@google.com> Wed Nov 22 10:32:11 2023 +0000
tree f2aa0c1f73e0b17a6c81d8d97ee27811d45dce64
parent 54e21392c6239f4d3e1c0a597d4fa6d497478080

[Audiosharing] Add device volume controls.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I5330cf3b3b4497af22820657b61279070f9c4af1

res/xml/bluetooth_audio_sharing.xml

diff --git a/res/xml/bluetooth_audio_sharing.xml b/res/xml/bluetooth_audio_sharing.xml
index 681c768..d5e08bb 100644
--- a/res/xml/bluetooth_audio_sharing.xml
+++ b/res/xml/bluetooth_audio_sharing.xml
@@ -19,18 +19,23 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/audio_sharing_title">
 
+    <PreferenceCategory
+        android:key="audio_sharing_device_volume_group"
+        android:title="Devices listening"
+        settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingDeviceVolumeGroupController" />
+
     <Preference
-        android:key="calls_and_alarms"
-        android:title="@string/calls_and_alarms_device_title"
         android:icon="@drawable/ic_audio_calls_and_alarms"
-        settings:controller="com.android.settings.connecteddevice.audiosharing.CallsAndAlarmsPreferenceController"
-        android:summary=""/>
+        android:key="calls_and_alarms"
+        android:summary=""
+        android:title="@string/calls_and_alarms_device_title"
+        settings:controller="com.android.settings.connecteddevice.audiosharing.CallsAndAlarmsPreferenceController" />
 
     <com.android.settings.connecteddevice.audiosharing.AudioSharingNamePreference
         android:key="audio_sharing_stream_name"
-        android:title="Stream name"
         android:summary="********"
-        settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingNamePreferenceController"/>
+        android:title="Stream name"
+        settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingNamePreferenceController" />
 
     <PreferenceCategory
         android:key="audio_streams_settings_category"
@@ -38,10 +43,10 @@
         settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsCategoryController">
 
         <Preference
-            android:key="audio_streams_settings"
             android:fragment="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsDashboardFragment"
-            android:title="@string/audio_streams_pref_title"
-            android:icon="@drawable/ic_chevron_right_24dp" />
+            android:icon="@drawable/ic_chevron_right_24dp"
+            android:key="audio_streams_settings"
+            android:title="@string/audio_streams_pref_title" />
 
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file