Merge "Add audio category preference in more settings fragment" into main
diff --git a/res/xml/bluetooth_device_more_settings_fragment.xml b/res/xml/bluetooth_device_more_settings_fragment.xml
index 4fb4aca..83aee8a 100644
--- a/res/xml/bluetooth_device_more_settings_fragment.xml
+++ b/res/xml/bluetooth_device_more_settings_fragment.xml
@@ -20,5 +20,8 @@
android:title="@string/device_details_more_settings">
<PreferenceCategory
+ android:key="bluetooth_audio_device_type_group"/>
+
+ <PreferenceCategory
android:key="bluetooth_profiles"/>
</PreferenceScreen>
diff --git a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsMoreSettingsFragment.kt b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsMoreSettingsFragment.kt
index 885217e..7cb1c0d 100644
--- a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsMoreSettingsFragment.kt
+++ b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsMoreSettingsFragment.kt
@@ -27,6 +27,7 @@
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 @@
formatter.getInvisibleBluetoothProfiles(
FragmentTypeModel.DeviceDetailsMoreSettingsFragment
),
- )
+ ),
+ BluetoothDetailsAudioDeviceTypeController(
+ context,
+ this,
+ localBluetoothManager,
+ cachedDevice,
+ settingsLifecycle,
+ ),
)
}