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

Commit 483dc979 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Introduce BluetoothAudioBitsPerSamplePrefCtrl 

 - Create new BluetoothAudioBitsPerSamplePreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I86575d171a005f62f731d9001f08ddcf976ad826
parent 0ef326f3

src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceController.java

0 → 100644
+102 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.development;



import android.bluetooth.BluetoothCodecConfig;

import android.content.Context;



import com.android.settings.R;

import com.android.settingslib.core.lifecycle.Lifecycle;



public class BluetoothAudioBitsPerSamplePreferenceController extends

        AbstractBluetoothA2dpPreferenceController {



    private static final int DEFAULT_INDEX = 0;

    private static final String BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY =

            "bluetooth_select_a2dp_bits_per_sample";



    public BluetoothAudioBitsPerSamplePreferenceController(Context context, Lifecycle lifecycle,

            BluetoothA2dpConfigStore store) {

        super(context, lifecycle, store);

    }



    @Override

    public String getPreferenceKey() {

        return BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY;

    }



    @Override

    protected String[] getListValues() {

        return mContext.getResources().getStringArray(

                R.array.bluetooth_a2dp_codec_bits_per_sample_values);

    }



    @Override

    protected String[] getListSummaries() {

        return mContext.getResources().getStringArray(

                R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);

    }



    @Override

    protected int getDefaultIndex() {

        return DEFAULT_INDEX;

    }



    @Override

    protected void writeConfigurationValues(Object newValue) {

        final int index = mPreference.findIndexOfValue(newValue.toString());

        int bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_NONE; // default

        switch (index) {

            case 0:

                // Reset to default

                break;

            case 1:

                bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_16;

                break;

            case 2:

                bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_24;

                break;

            case 3:

                bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_32;

                break;

            default:

                break;

        }

        mBluetoothA2dpConfigStore.setBitsPerSample(bitsPerSampleValue);

    }



    @Override

    protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {

        final int bitsPerSample = config.getBitsPerSample();

        int index = DEFAULT_INDEX;

        switch (bitsPerSample) {

            case BluetoothCodecConfig.BITS_PER_SAMPLE_16:

                index = 1;

                break;

            case BluetoothCodecConfig.BITS_PER_SAMPLE_24:

                index = 2;

                break;

            case BluetoothCodecConfig.BITS_PER_SAMPLE_32:

                index = 3;

                break;

            case BluetoothCodecConfig.BITS_PER_SAMPLE_NONE:

            default:

                break;

        }

        return index;

    }

}

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -381,7 +381,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
                bluetoothA2dpConfigStore));

        controllers.add(new BluetoothAudioSampleRatePreferenceController(context, lifecycle,

                bluetoothA2dpConfigStore));

        // bluetooth audio bits per sample

        controllers.add(new BluetoothAudioBitsPerSamplePreferenceController(context, lifecycle,

                bluetoothA2dpConfigStore));

        // bluetooth audio channel mode

        // bluetooth audio ldac codec: playback quality

        controllers.add(new ShowTapsPreferenceController(context));

tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ public class BluetoothCodecConfig { 
    public static final int CODEC_PRIORITY_HIGHEST = 1000 * 1000;

    public static final int BITS_PER_SAMPLE_NONE = 0;

    public static final int CHANNEL_MODE_NONE = 0;

    public static final int BITS_PER_SAMPLE_24 =  0x1 << 1;



    public int getSampleRate() {

        return 0;
@@ -37,4 +38,8 @@ public class BluetoothCodecConfig { 
    public int getCodecType() {

        return 0;

    }



    public int getBitsPerSample() {

        return 0;

    }

}

tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java

0 → 100644
+111 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.development;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.bluetooth.BluetoothCodecConfig;

import android.content.Context;

import android.support.v7.preference.ListPreference;

import android.support.v7.preference.PreferenceScreen;



import com.android.settings.TestConfig;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settingslib.core.lifecycle.Lifecycle;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class BluetoothAudioBitsPerSamplePreferenceControllerTest {



    @Mock

    private BluetoothCodecConfig mBluetoothCodecConfig;

    @Mock

    private ListPreference mPreference;

    @Mock

    private PreferenceScreen mScreen;

    @Mock

    private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;



    /**

     * 0: Use System Selection (Default)

     * 1: 16 bits/sample

     * 2: 24 bits/sample

     * 3: 32 bits/sample

     */

    private String[] mListValues;

    private Context mContext;

    private BluetoothAudioBitsPerSamplePreferenceController mController;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = spy(new BluetoothAudioBitsPerSamplePreferenceController(mContext,

                new Lifecycle(), mBluetoothA2dpConfigStore));

        mListValues = mController.getListValues();

        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);

        mController.displayPreference(mScreen);

    }



    @Test

    public void writeConfigurationValues_option2_shouldWriteOption2ToSharedStore() {

        when(mPreference.findIndexOfValue(mListValues[2])).thenReturn(2);

        mController.writeConfigurationValues(mListValues[2]);



        verify(mBluetoothA2dpConfigStore).setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_24);

    }



    @Test

    public void writeConfigurationValues_default_shouldSetDefault() {

        when(mPreference.findIndexOfValue(mListValues[0])).thenReturn(0);

        mController.writeConfigurationValues(mListValues[0]);



        verify(mBluetoothA2dpConfigStore).setBitsPerSample(

                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE);

    }



    @Test

    public void getCurrentA2dpSettingIndex_option2_shouldReturnSecondIndex() {

        when(mBluetoothCodecConfig.getBitsPerSample()).thenReturn(

                BluetoothCodecConfig.BITS_PER_SAMPLE_24);



        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);



        assertThat(index).isEqualTo(2);

    }



    @Test

    public void getCurrentA2dpSettingIndex_unknownOption_shouldReturnDefault() {

        when(mBluetoothCodecConfig.getCodecType()).thenReturn(1381391835);



        final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);



        assertThat(index).isEqualTo(0);

    }

}