From 9a0495f6368eed5671d60670d5803bfe4fb272ca Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 25 Sep 2017 16:06:35 -0700 Subject: [PATCH] Introduce TetheringHardwareAccelPreferenceCtrl - Create new TetheringHardwareAccelPreferenceController - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Ida551460d8227b20cc6bca3f1d46c39ee7176f8f --- .../DevelopmentSettingsDashboardFragment.java | 2 +- ...ringHardwareAccelPreferenceController.java | 90 +++++++++++++ ...HardwareAccelPreferenceControllerTest.java | 119 ++++++++++++++++++ 3 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 787ce16c2b1..c3a7dd9765e 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -207,7 +207,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new WifiAggressiveHandoverPreferenceController(context)); controllers.add(new WifiRoamScansPreferenceController(context)); controllers.add(new MobileDataAlwaysOnPreferenceController(context)); - // tethering hardware acceleration + controllers.add(new TetheringHardwareAccelPreferenceController(context)); // select usb configuration controllers.add(new BluetoothDeviceNoNamePreferenceController(context)); // disable absolute volume diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java new file mode 100644 index 00000000000..f638f311324 --- /dev/null +++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java @@ -0,0 +1,90 @@ +/* + * 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.Settings; +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 TetheringHardwareAccelPreferenceController extends + DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener { + + private static final String TETHERING_HARDWARE_OFFLOAD = "tethering_hardware_offload"; + + // We use the "disabled status" in code, but show the opposite text + // on screen. So a value 0 indicates the tethering hardware accel is enabled. + @VisibleForTesting + static final int SETTING_VALUE_ON = 0; + @VisibleForTesting + static final int SETTING_VALUE_OFF = 1; + + private SwitchPreference mPreference; + + public TetheringHardwareAccelPreferenceController(Context context) { + super(context); + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public String getPreferenceKey() { + return TETHERING_HARDWARE_OFFLOAD; + } + + @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; + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.TETHER_OFFLOAD_DISABLED, + isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF); + return true; + } + + @Override + public void updateState(Preference preference) { + final int tetheringMode = Settings.Global.getInt( + mContext.getContentResolver(), + Settings.Global.TETHER_OFFLOAD_DISABLED, 0 /* default */); + mPreference.setChecked(tetheringMode != SETTING_VALUE_OFF); + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + mPreference.setEnabled(true); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.TETHER_OFFLOAD_DISABLED, SETTING_VALUE_OFF); + mPreference.setEnabled(false); + mPreference.setChecked(false); + } +} diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java new file mode 100644 index 00000000000..e044f2a3be1 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java @@ -0,0 +1,119 @@ +/* + * 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.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 android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +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) +public class TetheringHardwareAccelPreferenceControllerTest { + + @Mock + private SwitchPreference mPreference; + @Mock + private PreferenceScreen mPreferenceScreen; + + private Context mContext; + private TetheringHardwareAccelPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = new TetheringHardwareAccelPreferenceController(mContext); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( + mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @Test + public void onPreferenceChanged_settingEnabled_turnOnTetheringAccel() { + mController.onPreferenceChange(mPreference, true /* new value */); + + final int mode = Settings.System.getInt(mContext.getContentResolver(), + Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */); + + assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_ON); + } + + @Test + public void onPreferenceChanged_settingDisabled_turnOffTetheringAccel() { + mController.onPreferenceChange(mPreference, false /* new value */); + + final int mode = Settings.System.getInt(mContext.getContentResolver(), + Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */); + + assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF); + } + + @Test + public void updateState_settingEnabled_preferenceShouldBeChecked() { + Settings.System.putInt(mContext.getContentResolver(), + Settings.Global.TETHER_OFFLOAD_DISABLED, + TetheringHardwareAccelPreferenceController.SETTING_VALUE_ON); + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_settingDisabled_preferenceShouldNotBeChecked() { + Settings.System.putInt(mContext.getContentResolver(), + Settings.Global.TETHER_OFFLOAD_DISABLED, + TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF); + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsSwitchDisabled(); + final int mode = Settings.System.getInt(mContext.getContentResolver(), + Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */); + + assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF); + verify(mPreference).setEnabled(false); + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() { + mController.onDeveloperOptionsSwitchEnabled(); + + verify(mPreference).setEnabled(true); + } +}