Merge "Add quality preference controller for Bluetooth developer option"
This commit is contained in:
tim peng
Android (Google) Code Review
@@ -0,0 +1,119 @@
|
||||
/*
|
||||
* Copyright (C) 2019 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.bluetooth;
|
||||
|
||||
import android.bluetooth.BluetoothCodecConfig;
|
||||
import android.content.Context;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.development.BluetoothA2dpConfigStore;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Dialog preference controller to set the Bluetooth A2DP config of LDAC quality
|
||||
*/
|
||||
public class BluetoothQualityDialogPreferenceController extends
|
||||
AbstractBluetoothDialogPreferenceController {
|
||||
|
||||
private static final String KEY = "bluetooth_a2dp_ldac_playback_quality";
|
||||
private static final String TAG = "BtQualityCtr";
|
||||
|
||||
public BluetoothQualityDialogPreferenceController(Context context, Lifecycle lifecycle,
|
||||
BluetoothA2dpConfigStore store) {
|
||||
super(context, lifecycle, store);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
((BaseBluetoothDialogPreference) mPreference).setCallback(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void writeConfigurationValues(final int index) {
|
||||
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 getCurrentIndexByConfig(BluetoothCodecConfig config) {
|
||||
if (config == null) {
|
||||
Log.e(TAG, "Unable to get current config index. Config is null.");
|
||||
}
|
||||
return convertCfgToBtnIndex((int) config.getCodecSpecific1());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Integer> getSelectableIndex() {
|
||||
List<Integer> selectableIndex = new ArrayList<>();
|
||||
// All four items of LDAC are available.
|
||||
for (int i = 0; i < 4; i++) {
|
||||
selectableIndex.add(i);
|
||||
}
|
||||
return selectableIndex;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
super.updateState(preference);
|
||||
// Enable preference when current codec type is LDAC. For other cases, disable it.
|
||||
final BluetoothCodecConfig currentConfig = getCurrentCodecConfig();
|
||||
if (currentConfig != null
|
||||
&& currentConfig.getCodecType() == BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC) {
|
||||
preference.setEnabled(true);
|
||||
} else {
|
||||
preference.setEnabled(false);
|
||||
preference.setSummary("");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onHDAudioEnabled(boolean enabled) {
|
||||
mPreference.setEnabled(false);
|
||||
};
|
||||
|
||||
@VisibleForTesting
|
||||
int convertCfgToBtnIndex(int config) {
|
||||
int index = config - 1000;
|
||||
if (index < 0) {
|
||||
index = getDefaultIndex();
|
||||
}
|
||||
return index;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
/*
|
||||
* Copyright (C) 2019 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.bluetooth;
|
||||
|
||||
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.BluetoothA2dp;
|
||||
import android.bluetooth.BluetoothCodecConfig;
|
||||
import android.bluetooth.BluetoothCodecStatus;
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.development.BluetoothA2dpConfigStore;
|
||||
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.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class BluetoothQualityDialogPreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
private BluetoothA2dp mBluetoothA2dp;
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
|
||||
private BluetoothQualityDialogPreferenceController mController;
|
||||
private BluetoothQualityDialogPreference mPreference;
|
||||
private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
|
||||
private BluetoothCodecStatus mCodecStatus;
|
||||
private BluetoothCodecConfig mCodecConfigAAC;
|
||||
private BluetoothCodecConfig mCodecConfigLDAC;
|
||||
private Context mContext;
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mBluetoothA2dpConfigStore = spy(new BluetoothA2dpConfigStore());
|
||||
mController = new BluetoothQualityDialogPreferenceController(mContext, mLifecycle,
|
||||
mBluetoothA2dpConfigStore);
|
||||
mPreference = new BluetoothQualityDialogPreference(mContext);
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
mController.displayPreference(mScreen);
|
||||
mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
|
||||
BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
|
||||
BluetoothCodecConfig.SAMPLE_RATE_48000 | BluetoothCodecConfig.SAMPLE_RATE_88200,
|
||||
BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
|
||||
BluetoothCodecConfig.CHANNEL_MODE_NONE,
|
||||
0, 0, 0, 0);
|
||||
mCodecConfigLDAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,
|
||||
BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
|
||||
BluetoothCodecConfig.SAMPLE_RATE_96000,
|
||||
BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
|
||||
BluetoothCodecConfig.CHANNEL_MODE_NONE,
|
||||
1001, 0, 0, 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void writeConfigurationValues_checkSampleRate() {
|
||||
mController.writeConfigurationValues(0);
|
||||
verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(1000);
|
||||
|
||||
mController.writeConfigurationValues(1);
|
||||
verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(1001);
|
||||
|
||||
mController.writeConfigurationValues(2);
|
||||
verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(1002);
|
||||
|
||||
mController.writeConfigurationValues(3);
|
||||
verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(1003);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getCurrentIndexByConfig_verifyIndex() {
|
||||
assertThat(mController.getCurrentIndexByConfig(mCodecConfigLDAC)).isEqualTo(
|
||||
mController.convertCfgToBtnIndex(1001));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_codeTypeIsLDAC_enablePreference() {
|
||||
BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigLDAC};
|
||||
mCodecStatus = new BluetoothCodecStatus(mCodecConfigLDAC, null, mCodecConfigs);
|
||||
when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus);
|
||||
mController.onBluetoothServiceConnected(mBluetoothA2dp);
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.isEnabled()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_codeTypeAAC_disablePreference() {
|
||||
BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigLDAC};
|
||||
mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
|
||||
when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus);
|
||||
mController.onBluetoothServiceConnected(mBluetoothA2dp);
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.isEnabled()).isFalse();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user