Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11264e9a authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Bluetooth Settings: Restore Spatial Audio Settings"

parents 47aed306 65680a2f

res/xml/bluetooth_device_details_fragment.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,9 @@ 
    <PreferenceCategory

    <PreferenceCategory

        android:key="feature_controls_group"/>

        android:key="feature_controls_group"/>





    <PreferenceCategory

        android:key="spatial_audio_group"/>



    <PreferenceCategory

    <PreferenceCategory

        android:key="bluetooth_profiles"/>

        android:key="bluetooth_profiles"/>

src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java

+2 −7
Original line number Original line Diff line number Diff line
@@ -16,9 +16,6 @@ 




package com.android.settings.bluetooth;

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.content.Context;

import android.media.AudioDeviceAttributes;

import android.media.AudioDeviceAttributes;

import android.media.AudioDeviceInfo;

import android.media.AudioDeviceInfo;
@@ -45,7 +42,7 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
        implements Preference.OnPreferenceClickListener {

        implements Preference.OnPreferenceClickListener {





    private static final String TAG = "BluetoothSpatialAudioController";

    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_SPATIAL_AUDIO = "spatial_audio";

    private static final String KEY_HEAD_TRACKING = "head_tracking";

    private static final String KEY_HEAD_TRACKING = "head_tracking";
@@ -98,7 +95,7 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 




    @Override

    @Override

    public String getPreferenceKey() {

    public String getPreferenceKey() {

        return KEY_FEATURE_CONTROLS_GROUP;

        return KEY_SPATIAL_AUDIO_GROUP;

    }

    }





    @Override

    @Override
@@ -112,7 +109,6 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
        SwitchPreference spatialAudioPref = mProfilesContainer.findPreference(KEY_SPATIAL_AUDIO);

        SwitchPreference spatialAudioPref = mProfilesContainer.findPreference(KEY_SPATIAL_AUDIO);

        if (spatialAudioPref == null) {

        if (spatialAudioPref == null) {

            spatialAudioPref = createSpatialAudioPreference(mProfilesContainer.getContext());

            spatialAudioPref = createSpatialAudioPreference(mProfilesContainer.getContext());

            spatialAudioPref.setOrder(FEATURE_SPATIAL_AUDIO_ORDER);

            mProfilesContainer.addPreference(spatialAudioPref);

            mProfilesContainer.addPreference(spatialAudioPref);

        }

        }
@@ -123,7 +119,6 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
        SwitchPreference headTrackingPref = mProfilesContainer.findPreference(KEY_HEAD_TRACKING);

        SwitchPreference headTrackingPref = mProfilesContainer.findPreference(KEY_HEAD_TRACKING);

        if (headTrackingPref == null) {

        if (headTrackingPref == null) {

            headTrackingPref = createHeadTrackingPreference(mProfilesContainer.getContext());

            headTrackingPref = createHeadTrackingPreference(mProfilesContainer.getContext());

            headTrackingPref.setOrder(FEATURE_HEAD_TRACKING_ORDER);

            mProfilesContainer.addPreference(headTrackingPref);

            mProfilesContainer.addPreference(headTrackingPref);

        }

        }

src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -65,8 +65,6 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment 




    static final int FEATURE_HEARING_DEVICE_CONTROLS_ORDER = 1;

    static final int FEATURE_HEARING_DEVICE_CONTROLS_ORDER = 1;

    static final int FEATURE_AUDIO_ROUTING_ORDER = 2;

    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

    @VisibleForTesting

    static int EDIT_DEVICE_NAME_ITEM_ID = Menu.FIRST;

    static int EDIT_DEVICE_NAME_ITEM_ID = Menu.FIRST;