From 6177d91efeca6274f4453fa28bad1cd12fb23f9f Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Wed, 20 Sep 2017 15:34:25 -0700 Subject: [PATCH] Introduce DisableAutoUpdatesPreferenceController - Create new DisableAutomaticUpdatesPreferenceController - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Iae7ff3f7d2e296968c67e14c33089b3b42c4912a --- .../DevelopmentSettingsDashboardFragment.java | 2 +- ...isableAutomaticUpdatesPreferenceController.java | 92 ++++++++++++++++ ...leAutomaticUpdatesPreferenceControllerTest.java | 120 +++++++++++++++++++++ 3 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 141f1ba64e..15cd7b4ac1 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -184,7 +184,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new PictureColorModePreferenceController(context, lifecycle)); // webview implementation controllers.add(new CoolColorTemperaturePreferenceController(context)); - // automatic system updates + controllers.add(new DisableAutomaticUpdatesPreferenceController(context)); // system ui demo mode // quick settings developer tiles // usb debugging diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java new file mode 100644 index 0000000000..a1bfa90698 --- /dev/null +++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java @@ -0,0 +1,92 @@ +/* + * 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 DisableAutomaticUpdatesPreferenceController extends + DeveloperOptionsPreferenceController implements + Preference.OnPreferenceChangeListener { + + private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update"; + + private SwitchPreference mPreference; + + // We use the "disabled status" in code, but show the opposite text + // "Automatic system updates" on screen. So a value 0 indicates the + // automatic update is enabled. + @VisibleForTesting + final static int DISABLE_UPDATES_SETTING = 1; + @VisibleForTesting + final static int ENABLE_UPDATES_SETTING = 0; + + public DisableAutomaticUpdatesPreferenceController(Context context) { + super(context); + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public String getPreferenceKey() { + return OTA_DISABLE_AUTOMATIC_UPDATE_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 updatesEnabled = (Boolean) newValue; + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, + updatesEnabled ? ENABLE_UPDATES_SETTING : DISABLE_UPDATES_SETTING); + return true; + } + + @Override + public void updateState(Preference preference) { + final int updatesEnabled = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, 0 /* default */); + + mPreference.setChecked(updatesEnabled != DISABLE_UPDATES_SETTING); + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + mPreference.setEnabled(true); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, DISABLE_UPDATES_SETTING); + mPreference.setChecked(false); + mPreference.setEnabled(false); + } +} diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java new file mode 100644 index 0000000000..b4e0755386 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java @@ -0,0 +1,120 @@ +/* + * 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.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; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class DisableAutomaticUpdatesPreferenceControllerTest { + + @Mock + private PreferenceScreen mPreferenceScreen; + @Mock + private SwitchPreference mPreference; + + private Context mContext; + private DisableAutomaticUpdatesPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = new DisableAutomaticUpdatesPreferenceController(mContext); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( + mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @Test + public void onPreferenceChanged_turnOnAutomaticUpdates() { + mController.onPreferenceChange(null, true); + + final int mode = Settings.System.getInt(mContext.getContentResolver(), + Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, -1); + + assertThat(mode).isEqualTo( + DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING); + } + + @Test + public void onPreferenceChanged_turnOffAutomaticUpdates() { + mController.onPreferenceChange(null, false); + + final int mode = Settings.System.getInt(mContext.getContentResolver(), + Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, -1); + + assertThat(mode).isEqualTo( + DisableAutomaticUpdatesPreferenceController.DISABLE_UPDATES_SETTING); + } + + @Test + public void updateState_preferenceShouldBeChecked() { + Settings.System + .putInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, + DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING); + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_preferenceShouldNotBeChecked() { + Settings.System + .putInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, + DisableAutomaticUpdatesPreferenceController.DISABLE_UPDATES_SETTING); + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + + @Test + public void onDeveloperOptionsDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsDisabled(); + + verify(mPreference).setEnabled(false); + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsEnabled_shouldEnablePreference() { + mController.onDeveloperOptionsEnabled(); + + verify(mPreference).setEnabled(true); + } + +} -- 2.11.0