Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev

res/xml/accessibility_audio_routing_fragment.xml

@@ -31,7 +31,7 @@
         android:key="audio_routing_ringtone"
         android:persistent="false"
         android:title="@string/bluetooth_ringtone_title"
-        settings:controller="com.android.settings.bluetooth.HearingDeviceRingtoneRoutingPreferenceController" />
+        settings:controller="com.android.settings.accessibility.HearingDeviceRingtoneRoutingPreferenceController" />
 
     <ListPreference
         android:entries="@array/bluetooth_audio_routing_titles"
@@ -40,7 +40,7 @@
         android:key="audio_routing_call"
         android:persistent="false"
         android:title="@string/bluetooth_call_title"
-        settings:controller="com.android.settings.bluetooth.HearingDeviceCallRoutingPreferenceController" />
+        settings:controller="com.android.settings.accessibility.HearingDeviceCallRoutingPreferenceController" />
 
     <ListPreference
         android:entries="@array/bluetooth_audio_routing_titles"
@@ -49,7 +49,7 @@
         android:key="audio_routing_media"
         android:persistent="false"
         android:title="@string/bluetooth_media_title"
-        settings:controller="com.android.settings.bluetooth.HearingDeviceMediaRoutingPreferenceController" />
+        settings:controller="com.android.settings.accessibility.HearingDeviceMediaRoutingPreferenceController" />
 
     <ListPreference
         android:entries="@array/bluetooth_audio_routing_titles"
@@ -58,7 +58,7 @@
         android:key="audio_routing_system_sounds"
         android:persistent="false"
         android:title="@string/bluetooth_system_sounds_title"
-        settings:controller="com.android.settings.bluetooth.HearingDeviceSystemSoundsRoutingPreferenceController" />
+        settings:controller="com.android.settings.accessibility.HearingDeviceSystemSoundsRoutingPreferenceController" />
 
     <com.android.settings.accessibility.AccessibilityFooterPreference
         android:key="hearing_device_footer"

res/xml/accessibility_hearing_aids.xml

@@ -45,8 +45,17 @@
     <PreferenceCategory
         android:key="hearing_options_category"
         android:title="@string/accessibility_screen_option">
+
+        <Preference
+            android:key="audio_routing"
+            android:title="@string/bluetooth_audio_routing_title"
+            android:summary="@string/bluetooth_audio_routing_summary"
+            android:fragment="com.android.settings.accessibility.AccessibilityAudioRoutingFragment"
+            settings:controller="com.android.settings.accessibility.HearingAidAudioRoutingPreferenceController"/>
+
         <SwitchPreference
             android:key="hearing_aid_compatibility"
+            android:order="30"
             android:title="@string/accessibility_hac_mode_title"
             android:summary="@string/accessibility_hac_mode_summary"
             settings:searchable="true"

res/xml/bluetooth_device_details_fragment.xml

@@ -69,12 +69,7 @@
         android:key="device_companion_apps"/>
 
     <PreferenceCategory
-        android:key="device_controls_general"
-        android:title="@string/bluetooth_device_controls_general"/>
-
-    <PreferenceCategory
-        android:key="device_controls_specific"
-        android:title="@string/bluetooth_device_controls_specific"/>
+        android:key="device_controls_general" />
 
     <PreferenceCategory
         android:key="spatial_audio_group"/>