diff options
author | jeffreyhuang <jeffreyhuang@google.com> | 2017-09-25 13:35:07 -0700 |
---|---|---|
committer | jeffreyhuang <jeffreyhuang@google.com> | 2017-09-25 13:55:28 -0700 |
commit | d61c360385d5f95c39f1f8474bb0e3cb559a5554 (patch) | |
tree | 41823eef748c9554dac78510600cc200d673ed63 | |
parent | 4466843b80ab3275a1cfa5fb90579b0b5a63be4d (diff) | |
download | packages_apps_Settings-d61c360385d5f95c39f1f8474bb0e3cb559a5554.tar.gz packages_apps_Settings-d61c360385d5f95c39f1f8474bb0e3cb559a5554.tar.bz2 packages_apps_Settings-d61c360385d5f95c39f1f8474bb0e3cb559a5554.zip |
Introduce WifiDisplayCertPreferenceController
- Create new WifiDisplayCertificationPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I34688131054e1a9d660482b04ad4b792235c445a
3 files changed, 209 insertions, 1 deletions
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 141f1ba64e..0445a065b7 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -202,7 +202,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra // camera laser sensor // camera HAL HDR+ // feature flags - // wireless display certification + controllers.add(new WifiDisplayCertificationPreferenceController(context)); // enable wi-fi verbose logging // aggressive wifi to mobile handover // always allow wifi roam scans diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java new file mode 100644 index 0000000000..009bf9cdf9 --- /dev/null +++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java @@ -0,0 +1,89 @@ +/* + * 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 WifiDisplayCertificationPreferenceController extends + DeveloperOptionsPreferenceController implements + Preference.OnPreferenceChangeListener { + + private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification"; + + @VisibleForTesting + static final int SETTING_VALUE_ON = 1; + @VisibleForTesting + static final int SETTING_VALUE_OFF = 0; + + private SwitchPreference mPreference; + + public WifiDisplayCertificationPreferenceController(Context context) { + super(context); + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public String getPreferenceKey() { + return WIFI_DISPLAY_CERTIFICATION_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; + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, + isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF); + return true; + } + + @Override + public void updateState(Preference preference) { + final int wifiDisplayCertificationMode = Settings.Global.getInt( + mContext.getContentResolver(), Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, + SETTING_VALUE_OFF); + mPreference.setChecked(wifiDisplayCertificationMode != SETTING_VALUE_OFF); + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + mPreference.setEnabled(true); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, SETTING_VALUE_OFF); + mPreference.setEnabled(false); + mPreference.setChecked(false); + } +} diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java new file mode 100644 index 0000000000..c049bc1fbe --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.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 WifiDisplayCertificationPreferenceControllerTest { + + @Mock + private SwitchPreference mPreference; + @Mock + private PreferenceScreen mPreferenceScreen; + + private Context mContext; + private WifiDisplayCertificationPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = new WifiDisplayCertificationPreferenceController(mContext); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( + mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @Test + public void onPreferenceChanged_turnOnWifiDisplayCertification() { + mController.onPreferenceChange(mPreference, true /* new value */); + + final int mode = Settings.System.getInt(mContext.getContentResolver(), + Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, -1 /* default */); + + assertThat(mode).isEqualTo(WifiDisplayCertificationPreferenceController.SETTING_VALUE_ON); + } + + @Test + public void onPreferenceChanged_turnOffWifiDisplayCertification() { + mController.onPreferenceChange(mPreference, false /* new value */); + + final int mode = Settings.System.getInt(mContext.getContentResolver(), + Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, -1 /* default */); + + assertThat(mode).isEqualTo(WifiDisplayCertificationPreferenceController.SETTING_VALUE_OFF); + } + + @Test + public void updateState_preferenceShouldBeChecked() { + Settings.System.putInt(mContext.getContentResolver(), + Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, + WifiDisplayCertificationPreferenceController.SETTING_VALUE_ON); + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_preferenceShouldNotBeChecked() { + Settings.System.putInt(mContext.getContentResolver(), + Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, + WifiDisplayCertificationPreferenceController.SETTING_VALUE_OFF); + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsDisabled(); + final int mode = Settings.System.getInt(mContext.getContentResolver(), + Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, -1 /* default */); + + assertThat(mode).isEqualTo(WifiDisplayCertificationPreferenceController.SETTING_VALUE_OFF); + verify(mPreference).setEnabled(false); + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsEnabled_shouldEnablePreference() { + mController.onDeveloperOptionsEnabled(); + + verify(mPreference).setEnabled(true); + } +} |