Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa... (f0cd62cf) · Commits · e / os / android_packages_apps_Settings

res/values/config.xml

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -457,9 +457,6 @@
	<!-- Whether nfc detection point preview image is available or not. -->		<!-- Whether nfc detection point preview image is available or not. -->
	<bool name="config_nfc_detection_point">false</bool>		<bool name="config_nfc_detection_point">false</bool>

	<!-- Whether to show Enhanced Connectivity switch in Developer Options -->
	<bool name="config_show_enhanced_connectivity">false</bool>

	<!-- Whether to show Smooth Display feature in Settings Options -->		<!-- Whether to show Smooth Display feature in Settings Options -->
	<bool name="config_show_smooth_display">false</bool>		<bool name="config_show_smooth_display">false</bool>

res/xml/development_settings.xml

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -297,11 +297,6 @@
	android:title="@string/mobile_data_always_on"		android:title="@string/mobile_data_always_on"
	android:summary="@string/mobile_data_always_on_summary" />		android:summary="@string/mobile_data_always_on_summary" />

	<SwitchPreference
	android:key="enhanced_connectivity"
	android:title="@string/enhanced_connectivity"
	android:summary="@string/enhanced_connectivity_summary" />

	<SwitchPreference		<SwitchPreference
	android:key="tethering_hardware_offload"		android:key="tethering_hardware_offload"
	android:title="@string/tethering_hardware_offload"		android:title="@string/tethering_hardware_offload"

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -479,7 +479,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
	controllers.add(new BluetoothMapVersionPreferenceController(context));		controllers.add(new BluetoothMapVersionPreferenceController(context));
	controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));		controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
	controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));		controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
	controllers.add(new EnhancedConnectivityPreferenceController(context));
	controllers.add(new ShowTapsPreferenceController(context));		controllers.add(new ShowTapsPreferenceController(context));
	controllers.add(new PointerLocationPreferenceController(context));		controllers.add(new PointerLocationPreferenceController(context));
	controllers.add(new ShowSurfaceUpdatesPreferenceController(context));		controllers.add(new ShowSurfaceUpdatesPreferenceController(context));

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

deleted100644 → 0

+0 −87

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

	import androidx.preference.Preference;
	import androidx.preference.SwitchPreference;

	import com.android.internal.annotations.VisibleForTesting;
	import com.android.settings.R;
	import com.android.settings.core.PreferenceControllerMixin;
	import com.android.settingslib.development.DeveloperOptionsPreferenceController;

	/**
	* Preference controller for Enhanced Connectivity feature
	*/
	public class EnhancedConnectivityPreferenceController extends
	DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
	PreferenceControllerMixin {

	private static final String ENHANCED_CONNECTIVITY_KEY = "enhanced_connectivity";

	@VisibleForTesting
	static final int ENHANCED_CONNECTIVITY_ON = 1;
	// default is enhanced connectivity enabled.
	@VisibleForTesting
	static final int ENHANCED_CONNECTIVITY_OFF = 0;

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

	@Override
	public boolean onPreferenceChange(Preference preference, Object o) {
	final boolean isEnabled = (Boolean) o;
	Settings.Global.putInt(mContext.getContentResolver(),
	Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
	isEnabled
	? ENHANCED_CONNECTIVITY_ON
	: ENHANCED_CONNECTIVITY_OFF);
	return true;
	}

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

	@Override
	public void updateState(Preference preference) {
	final int enhancedConnectivityEnabled = Settings.Global.getInt(
	mContext.getContentResolver(), Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
	ENHANCED_CONNECTIVITY_ON);
	((SwitchPreference) mPreference).setChecked(
	enhancedConnectivityEnabled == ENHANCED_CONNECTIVITY_ON);
	}

	@Override
	public boolean isAvailable() {
	return mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity);
	}

	@Override
	protected void onDeveloperOptionsSwitchDisabled() {
	super.onDeveloperOptionsSwitchDisabled();
	Settings.Global.putInt(mContext.getContentResolver(),
	Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
	ENHANCED_CONNECTIVITY_ON);
	((SwitchPreference) mPreference).setChecked(true);
	}
	}

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

deleted100644 → 0

+0 −133

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2020 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.verify;
	import static org.mockito.Mockito.when;

	import android.content.Context;
	import android.provider.Settings;

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

	import com.android.settings.R;

	import org.junit.Before;
	import org.junit.Test;
	import org.junit.runner.RunWith;
	import org.mockito.Answers;
	import org.mockito.Mock;
	import org.mockito.MockitoAnnotations;
	import org.robolectric.RobolectricTestRunner;

	@RunWith(RobolectricTestRunner.class)
	public class EnhancedConnectivityPreferenceControllerTest {
	@Mock(answer = Answers.RETURNS_DEEP_STUBS)
	private Context mContext;

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

	private EnhancedConnectivityPreferenceController mController;

	@Before
	public void setUp() {
	MockitoAnnotations.initMocks(this);
	mController = new EnhancedConnectivityPreferenceController(mContext);
	when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
	.thenReturn(mPreference);
	mController.displayPreference(mPreferenceScreen);
	}

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

	assertThat(isSettingEnabled()).isTrue();
	}

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

	assertThat(isSettingEnabled()).isFalse();
	}

	@Test
	public void updateState_preferenceShouldBeChecked() {
	Settings.Global.putInt(mContext.getContentResolver(),
	Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 1 /* enabled */);
	mController.updateState(mPreference);

	verify(mPreference).setChecked(true);
	}

	@Test
	public void updateState_preferenceShouldNotBeChecked() {
	Settings.Global.putInt(mContext.getContentResolver(),
	Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 0 /* disabled */);
	mController.updateState(mPreference);

	verify(mPreference).setChecked(false);
	}

	@Test
	public void onDeveloperOptionsDisabled_shouldEnablePreference() {
	mController.onDeveloperOptionsSwitchDisabled();

	verify(mPreference).setEnabled(false);
	verify(mPreference).setChecked(true);

	assertThat(isSettingEnabled()).isTrue();
	}

	@Test
	public void isAvailable_enhancedConnectivityShown_shouldReturnTrue() {
	enableEnhancedConnectivityPreference(true);

	boolean availability = mController.isAvailable();

	assertThat(availability).isTrue();
	}

	@Test
	public void isAvailable_enhancedConnectivityNotShown_shouldReturnFalse() {
	enableEnhancedConnectivityPreference(false);

	boolean availability = mController.isAvailable();

	assertThat(availability).isFalse();
	}

	private void enableEnhancedConnectivityPreference(boolean enable) {
	when(mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity))
	.thenReturn(enable);
	}

	private boolean isSettingEnabled() {
	return Settings.Global.getInt(mContext.getContentResolver(),
	Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
	EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON
	/* default on */)
	== EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON;
	}
	}