Loading src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java 0 → 100644 +84 −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.content.Context; import android.os.SystemProperties; import android.support.annotation.VisibleForTesting; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; public class BluetoothDeviceNoNamePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener { private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY = "bluetooth_show_devices_without_names"; @VisibleForTesting static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY = "persist.bluetooth.showdeviceswithoutnames"; private SwitchPreference mPreference; public BluetoothDeviceNoNamePreferenceController(Context context) { super(context); } @Override public boolean isAvailable() { return true; } @Override public String getPreferenceKey() { return BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY; } @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey()); } @Override public boolean onPreferenceChange(Preference preference, Object newValue) { final boolean isEnabled = (Boolean) newValue; SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, isEnabled ? "true" : "false"); return true; } @Override public void updateState(Preference preference) { final boolean isEnabled = SystemProperties.getBoolean( BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */); mPreference.setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchEnabled() { mPreference.setEnabled(true); } @Override protected void onDeveloperOptionsSwitchDisabled() { SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, "false"); mPreference.setChecked(false); mPreference.setEnabled(false); } } src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +1 −1 Original line number Diff line number Diff line Loading @@ -209,7 +209,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new MobileDataAlwaysOnPreferenceController(context)); // tethering hardware acceleration // select usb configuration // show bluetooth devices without names controllers.add(new BluetoothDeviceNoNamePreferenceController(context)); // disable absolute volume // enable in-band ringing // bluetooth avrcp version Loading tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java 0 → 100644 +123 −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.android.settings.development.BluetoothDeviceNoNamePreferenceController .BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_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.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.TestConfig; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; 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 BluetoothDeviceNoNamePreferenceControllerTest { @Mock private SwitchPreference mPreference; @Mock private PreferenceScreen mPreferenceScreen; private Context mContext; private BluetoothDeviceNoNamePreferenceController mController; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mController = new BluetoothDeviceNoNamePreferenceController(mContext); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( mPreference); mController.displayPreference(mPreferenceScreen); } @Test public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothDeviceNoName() { mController.onPreferenceChange(mPreference, true /* new value */); final boolean mode = SettingsShadowSystemProperties.getBoolean( BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */); assertThat(mode).isTrue(); } @Test public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothDeviceNoName() { mController.onPreferenceChange(mPreference, false /* new value */); final boolean mode = SettingsShadowSystemProperties.getBoolean( BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */); assertThat(mode).isFalse(); } @Test public void updateState_settingEnabled_preferenceShouldBeChecked() { SettingsShadowSystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, Boolean.toString(true)); mController.updateState(mPreference); verify(mPreference).setChecked(true); } @Test public void updateState_settingDisabled_preferenceShouldNotBeChecked() { SettingsShadowSystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, Boolean.toString(false)); mController.updateState(mPreference); verify(mPreference).setChecked(false); } @Test public void onDeveloperOptionsDisabled_shouldDisablePreference() { mController.onDeveloperOptionsDisabled(); final boolean mode = SettingsShadowSystemProperties.getBoolean( BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */); assertThat(mode).isFalse(); verify(mPreference).setEnabled(false); verify(mPreference).setChecked(false); } @Test public void onDeveloperOptionsEnabled_shouldEnablePreference() { mController.onDeveloperOptionsEnabled(); verify(mPreference).setEnabled(true); } } Loading
src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java 0 → 100644 +84 −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.content.Context; import android.os.SystemProperties; import android.support.annotation.VisibleForTesting; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; public class BluetoothDeviceNoNamePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener { private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY = "bluetooth_show_devices_without_names"; @VisibleForTesting static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY = "persist.bluetooth.showdeviceswithoutnames"; private SwitchPreference mPreference; public BluetoothDeviceNoNamePreferenceController(Context context) { super(context); } @Override public boolean isAvailable() { return true; } @Override public String getPreferenceKey() { return BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY; } @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey()); } @Override public boolean onPreferenceChange(Preference preference, Object newValue) { final boolean isEnabled = (Boolean) newValue; SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, isEnabled ? "true" : "false"); return true; } @Override public void updateState(Preference preference) { final boolean isEnabled = SystemProperties.getBoolean( BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */); mPreference.setChecked(isEnabled); } @Override protected void onDeveloperOptionsSwitchEnabled() { mPreference.setEnabled(true); } @Override protected void onDeveloperOptionsSwitchDisabled() { SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, "false"); mPreference.setChecked(false); mPreference.setEnabled(false); } }
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +1 −1 Original line number Diff line number Diff line Loading @@ -209,7 +209,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new MobileDataAlwaysOnPreferenceController(context)); // tethering hardware acceleration // select usb configuration // show bluetooth devices without names controllers.add(new BluetoothDeviceNoNamePreferenceController(context)); // disable absolute volume // enable in-band ringing // bluetooth avrcp version Loading
tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java 0 → 100644 +123 −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.android.settings.development.BluetoothDeviceNoNamePreferenceController .BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_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.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.TestConfig; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; 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 BluetoothDeviceNoNamePreferenceControllerTest { @Mock private SwitchPreference mPreference; @Mock private PreferenceScreen mPreferenceScreen; private Context mContext; private BluetoothDeviceNoNamePreferenceController mController; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mController = new BluetoothDeviceNoNamePreferenceController(mContext); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( mPreference); mController.displayPreference(mPreferenceScreen); } @Test public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothDeviceNoName() { mController.onPreferenceChange(mPreference, true /* new value */); final boolean mode = SettingsShadowSystemProperties.getBoolean( BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */); assertThat(mode).isTrue(); } @Test public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothDeviceNoName() { mController.onPreferenceChange(mPreference, false /* new value */); final boolean mode = SettingsShadowSystemProperties.getBoolean( BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */); assertThat(mode).isFalse(); } @Test public void updateState_settingEnabled_preferenceShouldBeChecked() { SettingsShadowSystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, Boolean.toString(true)); mController.updateState(mPreference); verify(mPreference).setChecked(true); } @Test public void updateState_settingDisabled_preferenceShouldNotBeChecked() { SettingsShadowSystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, Boolean.toString(false)); mController.updateState(mPreference); verify(mPreference).setChecked(false); } @Test public void onDeveloperOptionsDisabled_shouldDisablePreference() { mController.onDeveloperOptionsDisabled(); final boolean mode = SettingsShadowSystemProperties.getBoolean( BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */); assertThat(mode).isFalse(); verify(mPreference).setEnabled(false); verify(mPreference).setChecked(false); } @Test public void onDeveloperOptionsEnabled_shouldEnablePreference() { mController.onDeveloperOptionsEnabled(); verify(mPreference).setEnabled(true); } }