From 65680a2fd75f696207928f40adbb2cbe64dae54b Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Fri, 6 Jan 2023 16:21:29 -0800 Subject: [PATCH] Bluetooth Settings: Restore Spatial Audio Settings No need to gate under feature flag, it only shows if Spatial Audio exists on device. Test: Connect BT headset and see spatial audio settings Bug: 264709855 Change-Id: Iddda3eb430b62880036bbe8c680addca07a60ab2 --- res/xml/bluetooth_device_details_fragment.xml | 3 +++ .../BluetoothDetailsSpatialAudioController.java | 9 ++------- .../bluetooth/BluetoothDeviceDetailsFragment.java | 2 -- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/res/xml/bluetooth_device_details_fragment.xml b/res/xml/bluetooth_device_details_fragment.xml index 68b234da046..23f026b7f14 100644 --- a/res/xml/bluetooth_device_details_fragment.xml +++ b/res/xml/bluetooth_device_details_fragment.xml @@ -73,6 +73,9 @@ + + diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java b/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java index b5e4c3256e3..a1e133e6104 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java @@ -16,9 +16,6 @@ package com.android.settings.bluetooth; -import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.FEATURE_HEAD_TRACKING_ORDER; -import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.FEATURE_SPATIAL_AUDIO_ORDER; - import android.content.Context; import android.media.AudioDeviceAttributes; import android.media.AudioDeviceInfo; @@ -45,7 +42,7 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont implements Preference.OnPreferenceClickListener { private static final String TAG = "BluetoothSpatialAudioController"; - private static final String KEY_FEATURE_CONTROLS_GROUP = "feature_controls_group"; + private static final String KEY_SPATIAL_AUDIO_GROUP = "spatial_audio_group"; private static final String KEY_SPATIAL_AUDIO = "spatial_audio"; private static final String KEY_HEAD_TRACKING = "head_tracking"; @@ -98,7 +95,7 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont @Override public String getPreferenceKey() { - return KEY_FEATURE_CONTROLS_GROUP; + return KEY_SPATIAL_AUDIO_GROUP; } @Override @@ -112,7 +109,6 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont SwitchPreference spatialAudioPref = mProfilesContainer.findPreference(KEY_SPATIAL_AUDIO); if (spatialAudioPref == null) { spatialAudioPref = createSpatialAudioPreference(mProfilesContainer.getContext()); - spatialAudioPref.setOrder(FEATURE_SPATIAL_AUDIO_ORDER); mProfilesContainer.addPreference(spatialAudioPref); } @@ -123,7 +119,6 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont SwitchPreference headTrackingPref = mProfilesContainer.findPreference(KEY_HEAD_TRACKING); if (headTrackingPref == null) { headTrackingPref = createHeadTrackingPreference(mProfilesContainer.getContext()); - headTrackingPref.setOrder(FEATURE_HEAD_TRACKING_ORDER); mProfilesContainer.addPreference(headTrackingPref); } diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index 8eaff45b400..b4bb0ff62cd 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -65,8 +65,6 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment static final int FEATURE_HEARING_DEVICE_CONTROLS_ORDER = 1; static final int FEATURE_AUDIO_ROUTING_ORDER = 2; - static final int FEATURE_SPATIAL_AUDIO_ORDER = 3; - static final int FEATURE_HEAD_TRACKING_ORDER = 4; @VisibleForTesting static int EDIT_DEVICE_NAME_ITEM_ID = Menu.FIRST;