Merge "Add audio category preference in more settings fragment" into main

res/xml/bluetooth_device_more_settings_fragment.xml

@@ -19,6 +19,9 @@
     android:key="bluetooth_device_more_settings_screen"
     android:title="@string/device_details_more_settings">
 
+    <PreferenceCategory
+        android:key="bluetooth_audio_device_type_group"/>
+
     <PreferenceCategory
         android:key="bluetooth_profiles"/>
 </PreferenceScreen>

src/com/android/settings/bluetooth/ui/view/DeviceDetailsMoreSettingsFragment.kt

@@ -27,6 +27,7 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.lifecycle.lifecycleScope
 import com.android.settings.R
+import com.android.settings.bluetooth.BluetoothDetailsAudioDeviceTypeController
 import com.android.settings.bluetooth.BluetoothDetailsProfilesController
 import com.android.settings.bluetooth.Utils
 import com.android.settings.bluetooth.ui.model.DeviceSettingPreferenceModel
@@ -140,7 +141,14 @@ class DeviceDetailsMoreSettingsFragment : DashboardFragment() {
                 formatter.getInvisibleBluetoothProfiles(
                     FragmentTypeModel.DeviceDetailsMoreSettingsFragment
                 ),
-            )
+            ),
+            BluetoothDetailsAudioDeviceTypeController(
+                context,
+                this,
+                localBluetoothManager,
+                cachedDevice,
+                settingsLifecycle,
+            ),
         )
     }