diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java new file mode 100644 index 00000000000..a56f5ea443b --- /dev/null +++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java @@ -0,0 +1,94 @@ +/* + * 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.content.Context; +import android.os.SystemProperties; +import android.support.annotation.VisibleForTesting; +import android.support.v7.preference.ListPreference; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; +import android.text.TextUtils; + +import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + +public class BluetoothAvrcpVersionPreferenceController extends + DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, + PreferenceControllerMixin { + + private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY = + "bluetooth_select_avrcp_version"; + + @VisibleForTesting + static final String BLUETOOTH_AVRCP_VERSION_PROPERTY = "persist.bluetooth.avrcpversion"; + + private final String[] mListValues; + private final String[] mListSummaries; + private ListPreference mPreference; + + public BluetoothAvrcpVersionPreferenceController(Context context) { + super(context); + + mListValues = context.getResources().getStringArray(R.array.bluetooth_avrcp_version_values); + mListSummaries = context.getResources().getStringArray(R.array.bluetooth_avrcp_versions); + } + + @Override + public String getPreferenceKey() { + return BLUETOOTH_SELECT_AVRCP_VERSION_KEY; + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + + mPreference = (ListPreference) screen.findPreference(getPreferenceKey()); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, newValue.toString()); + updateState(mPreference); + return true; + } + + @Override + public void updateState(Preference preference) { + final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY); + int index = 0; // Defaults to AVRCP 1.4 + for (int i = 0; i < mListValues.length; i++) { + if (TextUtils.equals(currentValue, mListValues[i])) { + index = i; + break; + } + } + mPreference.setValue(mListValues[index]); + mPreference.setSummary(mListSummaries[index]); + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + mPreference.setEnabled(true); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + mPreference.setEnabled(false); + } +} diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 39e3d03eb75..513cd04234c 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -285,7 +285,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new BluetoothDeviceNoNamePreferenceController(context)); controllers.add(new BluetoothAbsoluteVolumePreferenceController(context)); controllers.add(new BluetoothInbandRingingPreferenceController(context)); - // bluetooth avrcp version + controllers.add(new BluetoothAvrcpVersionPreferenceController(context)); // bluetooth audio codec // bluetooth audio sample rate // bluetooth audio bits per sample diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java new file mode 100644 index 00000000000..07d0e509c99 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -0,0 +1,146 @@ +/* + * 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.android.settings.development.BluetoothAvrcpVersionPreferenceController + .BLUETOOTH_AVRCP_VERSION_PROPERTY; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.os.SystemProperties; +import android.support.v7.preference.ListPreference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.R; +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; + +import org.junit.After; +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, + shadows = {SettingsShadowSystemProperties.class}) +public class BluetoothAvrcpVersionPreferenceControllerTest { + + @Mock + private ListPreference mPreference; + @Mock + private PreferenceScreen mPreferenceScreen; + + private Context mContext; + private BluetoothAvrcpVersionPreferenceController mController; + + /** + * 0: AVRCP 1.4 (Default) + * 1: AVRCP 1.3 + * 2: AVRCP 1.5 + * 3: AVRCP 1.6 + */ + private String[] mListValues; + private String[] mListSummaries; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mListValues = mContext.getResources().getStringArray( + R.array.bluetooth_avrcp_version_values); + mListSummaries = mContext.getResources().getStringArray(R.array.bluetooth_avrcp_versions); + mController = new BluetoothAvrcpVersionPreferenceController(mContext); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( + mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @After + public void teardown() { + SettingsShadowSystemProperties.clear(); + } + + @Test + public void onPreferenceChange_setAvrcp13_shouldEnableAvrcp13() { + mController.onPreferenceChange(mPreference, mListValues[1]); + + final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY); + + assertThat(currentValue).isEqualTo(mListValues[1]); + } + + @Test + public void onPreferenceChange_setAvrcp15_shouldEnableAvrcp15() { + mController.onPreferenceChange(mPreference, mListValues[2]); + + final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY); + + assertThat(currentValue).isEqualTo(mListValues[2]); + } + + @Test + public void updateState_setAvrcp13_shouldSetPreferenceToAvrcp13() { + SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, mListValues[1]); + + mController.updateState(mPreference); + + verify(mPreference).setValue(mListValues[1]); + verify(mPreference).setSummary(mListSummaries[1]); + } + + @Test + public void updateState_setAvrcp15_shouldSetPreferenceToAvrcp15() { + SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, mListValues[2]); + + mController.updateState(mPreference); + + verify(mPreference).setValue(mListValues[2]); + verify(mPreference).setSummary(mListSummaries[2]); + } + + @Test + public void updateState_noValueSet_shouldSetDefaultToAvrcp14() { + mController.updateState(mPreference); + + verify(mPreference).setValue(mListValues[0]); + verify(mPreference).setSummary(mListSummaries[0]); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsSwitchDisabled(); + + verify(mPreference).setEnabled(false); + } + + @Test + public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() { + mController.onDeveloperOptionsSwitchEnabled(); + + verify(mPreference).setEnabled(true); + } +}