Merge "Remove developer option for bluetooth Gabeldorche" am: 4041027433 am:... (6b985b36) · Commits · e / os / android_packages_apps_Settings

res/xml/development_settings.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -312,11 +312,6 @@
		android:title="@string/bluetooth_disable_absolute_volume"
		android:summary="@string/bluetooth_disable_absolute_volume_summary" />

		<SwitchPreference
		android:key="bluetooth_gabeldorsche_enable"
		android:title="@string/bluetooth_enable_gabeldorsche"
		android:summary="@string/bluetooth_enable_gabeldorsche_summary" />

		<SwitchPreference
		android:key="bluetooth_disable_a2dp_hw_offload"
		android:title="@string/bluetooth_disable_a2dp_hw_offload" />

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

deleted100644 → 0

+0 −73

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.provider.DeviceConfig;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		import androidx.preference.SwitchPreference;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		/**
		* Preference controller for Bluetooth Gabeldorche feature
		*/
		public class BluetoothGabeldorschePreferenceController extends
		DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
		PreferenceControllerMixin {

		private static final String BLUETOOTH_GABELDORSCHE_KEY =
		"bluetooth_gabeldorsche_enable";

		@VisibleForTesting
		static final String CURRENT_GD_FLAG = "INIT_gd_scanning";

		public BluetoothGabeldorschePreferenceController(Context context) {
		super(context);
		}

		@Override
		public String getPreferenceKey() {
		return BLUETOOTH_GABELDORSCHE_KEY;
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean isEnabled = (Boolean) newValue;
		DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
		CURRENT_GD_FLAG, isEnabled ? "true" : "false", false /* makeDefault */);
		return true;
		}

		@Override
		public void updateState(Preference preference) {
		final boolean isEnabled = DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_BLUETOOTH, CURRENT_GD_FLAG, false /* default */);
		((SwitchPreference) mPreference).setChecked(isEnabled);
		}

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		super.onDeveloperOptionsSwitchDisabled();
		DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
		CURRENT_GD_FLAG, null, false /* makeDefault */);
		((SwitchPreference) mPreference).setChecked(false);
		}
		}

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -538,7 +538,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		controllers.add(new TetheringHardwareAccelPreferenceController(context));
		controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
		controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
		controllers.add(new BluetoothGabeldorschePreferenceController(context));
		controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
		controllers.add(new BluetoothMapVersionPreferenceController(context));
		controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));

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

deleted100644 → 0

+0 −118

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.BluetoothGabeldorschePreferenceController
		.CURRENT_GD_FLAG;

		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.provider.DeviceConfig;

		import androidx.preference.PreferenceScreen;
		import androidx.preference.SwitchPreference;

		import org.junit.Before;
		import org.junit.Ignore;
		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 BluetoothGabeldorschePreferenceControllerTest {

		@Mock
		private SwitchPreference mPreference;
		@Mock
		private PreferenceScreen mPreferenceScreen;

		private BluetoothGabeldorschePreferenceController mController;

		@Before
		public void setup() {
		MockitoAnnotations.initMocks(this);
		Context context = RuntimeEnvironment.application;
		mController = new BluetoothGabeldorschePreferenceController(context);
		when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
		.thenReturn(mPreference);
		mController.displayPreference(mPreferenceScreen);
		}

		@Test
		@Ignore
		public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothGabeldorsche() {
		mController.onPreferenceChange(mPreference, true /* new value */);

		boolean enabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,
		CURRENT_GD_FLAG, false /* defaultValue */);

		assertThat(enabled).isTrue();
		}

		@Test
		@Ignore
		public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothGabeldorsche() {
		mController.onPreferenceChange(mPreference, false /* new value */);

		boolean enabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,
		CURRENT_GD_FLAG, false /* defaultValue */);

		assertThat(enabled).isFalse();
		}

		@Test
		@Ignore
		public void updateState_settingEnabled_preferenceShouldBeChecked() {
		DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
		CURRENT_GD_FLAG, "true", false /* makeDefault */);

		mController.updateState(mPreference);

		verify(mPreference).setChecked(true);
		}

		@Test
		@Ignore
		public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
		DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
		CURRENT_GD_FLAG, "false", false /* makeDefault */);

		mController.updateState(mPreference);

		verify(mPreference).setChecked(false);
		}

		@Test
		@Ignore
		public void onDeveloperOptionsDisabled_shouldDisablePreference() {
		mController.onDeveloperOptionsDisabled();

		String configStr = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_BLUETOOTH,
		CURRENT_GD_FLAG);

		assertThat(configStr).isNull();
		verify(mPreference).setEnabled(false);
		verify(mPreference).setChecked(false);
		}
		}