From 141c92bf62de2a5387f3039f5a0e8ac19fb92ab5 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Tue, 26 Sep 2017 15:32:15 -0700 Subject: [PATCH] Introduce ConnectivityMonitorPreferenceCtrlV2 - Create new ConnectivityMonitorPreferenceControllerV2 - Deprecate ConnectivityMonitorPreferenceController - Create controller inside the DashboardFragment - Copy logic from ConnectivityMonitorPreferenceController with slight modifications for dashboard fragment compatibility Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Ibba32208abb2535e1d13b299705e4f4e63aef8c8 --- ...nnectivityMonitorPreferenceController.java | 4 + ...ectivityMonitorPreferenceControllerV2.java | 113 +++++++++ .../DevelopmentSettingsDashboardFragment.java | 2 +- tests/robotests/res/values-mcc999/config.xml | 1 + tests/robotests/res/values/config.xml | 1 + ...tivityMonitorPreferenceControllerTest.java | 4 + ...vityMonitorPreferenceControllerV2Test.java | 220 ++++++++++++++++++ 7 files changed, 344 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java create mode 100644 tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2Test.java diff --git a/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java b/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java index fa7102ad0b9..e481809d0eb 100644 --- a/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java +++ b/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java @@ -28,6 +28,10 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; +/** + * deprecated in favor of {@link ConnectivityMonitorPreferenceControllerV2} + */ +@Deprecated public class ConnectivityMonitorPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java b/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java new file mode 100644 index 00000000000..1fe2a0f3826 --- /dev/null +++ b/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java @@ -0,0 +1,113 @@ +/* + * 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.os.SystemProperties; +import android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; +import android.text.TextUtils; +import android.widget.Toast; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.settings.R; + +public class ConnectivityMonitorPreferenceControllerV2 extends + DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener { + + private static final String KEY_CONNECTIVITY_MONITOR_SWITCH = "connectivity_monitor_switch"; + @VisibleForTesting + static final String BUILD_TYPE = "ro.build.type"; + @VisibleForTesting + static final String PROPERTY_CONNECTIVITY_MONITOR = "persist.radio.enable_tel_mon"; + + @VisibleForTesting + static final String ENABLED_STATUS = "enabled"; + @VisibleForTesting + static final String DISABLED_STATUS = "disabled"; + @VisibleForTesting + static final String USER_ENABLED_STATUS = "user_enabled"; + @VisibleForTesting + static final String USER_DISABLED_STATUS = "user_disabled"; + + @VisibleForTesting + static final String USERDEBUG_BUILD = "userdebug"; + @VisibleForTesting + static final String ENG_BUILD = "eng"; + + private SwitchPreference mPreference; + + public ConnectivityMonitorPreferenceControllerV2(Context context) { + super(context); + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + + mPreference = (SwitchPreference) screen.findPreference(KEY_CONNECTIVITY_MONITOR_SWITCH); + } + + @Override + public String getPreferenceKey() { + return KEY_CONNECTIVITY_MONITOR_SWITCH; + } + + @Override + public boolean isAvailable() { + final String buildType = SystemProperties.get(BUILD_TYPE); + return mContext.getResources().getBoolean(R.bool.config_show_connectivity_monitor) + && (TextUtils.equals(buildType, USERDEBUG_BUILD) + || TextUtils.equals(buildType, ENG_BUILD)); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + final boolean isEnabled = (Boolean) newValue; + SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR, + isEnabled ? USER_ENABLED_STATUS : USER_DISABLED_STATUS); + Toast.makeText(mContext, R.string.connectivity_monitor_toast, + Toast.LENGTH_LONG).show(); + return true; + } + + @Override + public void updateState(Preference preference) { + final boolean enabled = isConnectivityMonitorEnabled(); + mPreference.setChecked(enabled); + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + mPreference.setEnabled(true); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR, USER_DISABLED_STATUS); + mPreference.setChecked(false); + mPreference.setEnabled(false); + } + + private boolean isConnectivityMonitorEnabled() { + final String cmStatus = SystemProperties.get(PROPERTY_CONNECTIVITY_MONITOR, + DISABLED_STATUS); + return TextUtils.equals(ENABLED_STATUS, cmStatus) || TextUtils.equals(USER_ENABLED_STATUS, + cmStatus); + } +} diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 787ce16c2b1..b3bb268446d 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -198,7 +198,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra // verify apps over usb // logger buffer sizes // store logger data persistently on device - // telephony monitor + controllers.add(new ConnectivityMonitorPreferenceControllerV2(context)); controllers.add(new CameraLaserSensorPreferenceControllerV2(context)); controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context)); // feature flags diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index e288225dda9..9d97bcfa760 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -18,4 +18,5 @@ true false false + false \ No newline at end of file diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml index 4f32bf74d16..0afbe2925c6 100644 --- a/tests/robotests/res/values/config.xml +++ b/tests/robotests/res/values/config.xml @@ -20,4 +20,5 @@ true true true + true \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java index d968ff99ad2..bb9a6ee5261 100644 --- a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java @@ -38,6 +38,10 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +/** + * deprecated in favor of {@link ConnectivityMonitorPreferenceControllerV2} + */ +@Deprecated @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class ConnectivityMonitorPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2Test.java new file mode 100644 index 00000000000..5b4f594bc90 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2Test.java @@ -0,0 +1,220 @@ +/* + * 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.android.settings.development.ConnectivityMonitorPreferenceControllerV2.ENG_BUILD; +import static com.android.settings.development + .ConnectivityMonitorPreferenceControllerV2.USERDEBUG_BUILD; + +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.os.SystemProperties; +import android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; + +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, shadows = + SettingsShadowSystemProperties.class) +public class ConnectivityMonitorPreferenceControllerV2Test { + + private static final String USER_BUILD = "user"; + + @Mock + private PreferenceScreen mScreen; + @Mock + private SwitchPreference mPreference; + + private Context mContext; + private ConnectivityMonitorPreferenceControllerV2 mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + SettingsShadowSystemProperties.clear(); + mContext = RuntimeEnvironment.application; + mController = new ConnectivityMonitorPreferenceControllerV2(mContext); + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); + mController.displayPreference(mScreen); + } + + @Test + public void isAvailable_trueShowFlagWithUserdebugBuild_shouldReturnTrue() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + + assertThat(mController.isAvailable()).isTrue(); + } + + @Test + public void isAvailable_trueShowFlagWithEngBuild_shouldReturnTrue() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, ENG_BUILD); + + assertThat(mController.isAvailable()).isTrue(); + } + + @Test + public void isAvailable_trueShowFlagWithUserBuild_shouldReturnFalse() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USER_BUILD); + + assertThat(mController.isAvailable()).isFalse(); + } + + @Test + @Config(qualifiers = "mcc999") + public void isAvailable_falseShowFlagWithUserdebugBuild_shouldReturnFalse() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + + assertThat(mController.isAvailable()).isFalse(); + } + + @Test + @Config(qualifiers = "mcc999") + public void isAvailable_falseShowFlagWithEngBuild_shouldReturnFalse() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, ENG_BUILD); + + assertThat(mController.isAvailable()).isFalse(); + } + + @Test + @Config(qualifiers = "mcc999") + public void isAvailable_falseShowFlagWithUserBuild_shouldReturnFalse() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USER_BUILD); + + assertThat(mController.isAvailable()).isFalse(); + } + + @Test + public void updateState_connectivityMonitorEnabled_shouldCheckedPreference() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceControllerV2.ENABLED_STATUS); + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_connectivityMonitorUserEnabled_shouldCheckedPreference() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceControllerV2.USER_ENABLED_STATUS); + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_connectivityMonitorDisabled_shouldUncheckedPreference() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceControllerV2.DISABLED_STATUS); + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void updateState_connectivityMonitorUserDisabled_shouldUncheckedPreference() { + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS); + SettingsShadowSystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void onPreferenceChange_preferenceChecked_shouldEnableConnectivityMonitor() { + SystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceControllerV2.USER_ENABLED_STATUS); + + mController.handlePreferenceTreeClick(mPreference); + + assertThat(ConnectivityMonitorPreferenceControllerV2.USER_ENABLED_STATUS).isEqualTo( + SystemProperties.get( + ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceControllerV2.DISABLED_STATUS)); + } + + @Test + public void onPreferenceChange_preferenceUnchecked_shouldDisableConnectivityMonitor() { + SystemProperties.set( + ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS); + + mController.handlePreferenceTreeClick(mPreference); + + assertThat(ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS).isEqualTo( + SystemProperties.get( + ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceControllerV2.DISABLED_STATUS)); + } + + @Test + public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() { + mController.onDeveloperOptionsSwitchEnabled(); + + verify(mPreference).setEnabled(true); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsSwitchDisabled(); + + String mode = SystemProperties.get( + ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + null /* default */); + + assertThat(mode).isEqualTo(ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS); + verify(mPreference).setEnabled(false); + verify(mPreference).setChecked(false); + } +}