From af3ec754ddce21866041a02fbe71245d7a5dd366 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Fri, 13 Oct 2017 14:27:10 -0700 Subject: [PATCH] Introduce BluetoothAudioQualityPreferenceCtrl - Create new BluetoothAudioQualityPreferenceController - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: I145c2e2554f5e9f5e7cfa79b3f6198a8b81105ec --- ...toothAudioQualityPreferenceController.java | 100 ++++++++++++++++ .../DevelopmentSettingsDashboardFragment.java | 3 +- .../bluetooth/BluetoothCodecConfig.java | 4 + ...hAudioQualityPreferenceControllerTest.java | 108 ++++++++++++++++++ 4 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/development/BluetoothAudioQualityPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java diff --git a/src/com/android/settings/development/BluetoothAudioQualityPreferenceController.java b/src/com/android/settings/development/BluetoothAudioQualityPreferenceController.java new file mode 100644 index 00000000000..7adf8e6b5a1 --- /dev/null +++ b/src/com/android/settings/development/BluetoothAudioQualityPreferenceController.java @@ -0,0 +1,100 @@ +/* + * 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 BluetoothAudioQualityPreferenceController extends + AbstractBluetoothA2dpPreferenceController { + + private static final int DEFAULT_INDEX = 3; + private static final String BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY = + "bluetooth_select_a2dp_ldac_playback_quality"; + + public BluetoothAudioQualityPreferenceController(Context context, Lifecycle lifecycle, + BluetoothA2dpConfigStore store) { + super(context, lifecycle, store); + } + + @Override + public String getPreferenceKey() { + return BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY; + } + + @Override + protected String[] getListValues() { + return mContext.getResources().getStringArray( + R.array.bluetooth_a2dp_codec_ldac_playback_quality_values); + } + + @Override + protected String[] getListSummaries() { + return mContext.getResources().getStringArray( + R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries); + } + + @Override + protected int getDefaultIndex() { + return DEFAULT_INDEX; + } + + @Override + protected void writeConfigurationValues(Object newValue) { + final int index = mPreference.findIndexOfValue(newValue.toString()); + int codecSpecific1Value = 0; // default + switch (index) { + case 0: + case 1: + case 2: + case 3: + codecSpecific1Value = 1000 + index; + break; + default: + break; + } + mBluetoothA2dpConfigStore.setCodecSpecific1Value(codecSpecific1Value); + } + + @Override + protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) { + // The actual values are 0, 1, 2 - those are extracted + // as mod-10 remainders of a larger value. + // The reason is because within BluetoothCodecConfig we cannot use + // a codec-specific value of zero. + int index = (int) config.getCodecSpecific1(); + if (index > 0) { + index %= 10; + } else { + index = DEFAULT_INDEX; + } + switch (index) { + case 0: + case 1: + case 2: + case 3: + break; + default: + index = DEFAULT_INDEX; + break; + } + return index; + } +} diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index f920248d0a2..77be7f3f4e4 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -385,7 +385,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra bluetoothA2dpConfigStore)); controllers.add(new BluetoothAudioChannelModePreferenceController(context, lifecycle, bluetoothA2dpConfigStore)); - // bluetooth audio ldac codec: playback quality + controllers.add(new BluetoothAudioQualityPreferenceController(context, lifecycle, + bluetoothA2dpConfigStore)); controllers.add(new ShowTapsPreferenceController(context)); controllers.add(new PointerLocationPreferenceController(context)); controllers.add(new ShowSurfaceUpdatesPreferenceController(context)); diff --git a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java b/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java index ebd4f9350ff..ee7bdb00276 100644 --- a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java +++ b/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java @@ -47,4 +47,8 @@ public class BluetoothCodecConfig { public int getChannelMode() { return 0; } + + public long getCodecSpecific1() { + return 0; + } } diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java new file mode 100644 index 00000000000..e00ac008328 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -0,0 +1,108 @@ +/* + * 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 BluetoothAudioQualityPreferenceControllerTest { + + @Mock + private BluetoothCodecConfig mBluetoothCodecConfig; + @Mock + private ListPreference mPreference; + @Mock + private PreferenceScreen mScreen; + @Mock + private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore; + + /** + * 0: Optimized for Audio Quality (990kbps/909kbps) + * 1: Balanced Audio And Connection Quality (660kbps/606kbps) + * 2: Stereo + */ + private String[] mListValues; + private Context mContext; + private BluetoothAudioQualityPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = spy(new BluetoothAudioQualityPreferenceController(mContext, + new Lifecycle(), mBluetoothA2dpConfigStore)); + mListValues = mController.getListValues(); + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); + mController.displayPreference(mScreen); + } + + @Test + public void writeConfigurationValues_option3_shouldWrite1003ToSharedStore() { + when(mPreference.findIndexOfValue(mListValues[3])).thenReturn(3); + mController.writeConfigurationValues(mListValues[3]); + + verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(1003); + } + + @Test + public void writeConfigurationValues_default_shouldSetDefault() { + when(mPreference.findIndexOfValue(mListValues[0])).thenReturn(0); + mController.writeConfigurationValues(mListValues[0]); + + verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(1000); + } + + @Test + public void getCurrentA2dpSettingIndex_option2_shouldReturnSecondIndex() { + when(mBluetoothCodecConfig.getCodecSpecific1()).thenReturn(Long.valueOf(2)); + + 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(3); + } +}