From 7cf6ba2aab575e467313986149a217ca513c971e Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Wed, 27 Sep 2017 15:55:49 -0700 Subject: [PATCH] Introduce ShowLayoutBoundsPreferenceController - Create new ShowLayoutBoundsPreferenceController - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Ie7bb26675f4dcedbff9607a2c4e4f5bee0343463 --- .../DevelopmentSettingsDashboardFragment.java | 2 +- .../ShowLayoutBoundsPreferenceController.java | 78 +++++++++++ ...wLayoutBoundsPreferenceControllerTest.java | 127 ++++++++++++++++++ 3 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 58963f71ea1..b380dcbf88a 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -285,7 +285,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new ShowTapsPreferenceController(context)); controllers.add(new PointerLocationPreferenceController(context)); controllers.add(new ShowSurfaceUpdatesPreferenceController(context)); - // show layout bounds + controllers.add(new ShowLayoutBoundsPreferenceController(context)); controllers.add(new RtlLayoutPreferenceController(context)); // window animation scale // transition animation scale diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java new file mode 100644 index 00000000000..fa13a583d05 --- /dev/null +++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java @@ -0,0 +1,78 @@ +/* + * 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.view.View; + +import com.android.settingslib.development.SystemPropPoker; + +public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPreferenceController + implements Preference.OnPreferenceChangeListener { + + private static final String DEBUG_LAYOUT_KEY = "debug_layout"; + + private SwitchPreference mPreference; + + public ShowLayoutBoundsPreferenceController(Context context) { + super(context); + } + + @Override + public String getPreferenceKey() { + return DEBUG_LAYOUT_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; + SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, + isEnabled ? Boolean.toString(true) : Boolean.toString(false)); + SystemPropPoker.getInstance().poke(); + return true; + } + + @Override + public void updateState(Preference preference) { + final boolean isEnabled = SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, + false /* default */); + mPreference.setChecked(isEnabled); + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + mPreference.setEnabled(true); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(false)); + mPreference.setChecked(false); + mPreference.setEnabled(false); + } +} diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java new file mode 100644 index 00000000000..2eb10701657 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java @@ -0,0 +1,127 @@ +/* + * 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.support.v14.preference.SwitchPreference; +import android.support.v7.preference.PreferenceScreen; +import android.view.View; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; + +import org.junit.After; +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 ShowLayoutBoundsPreferenceControllerTest { + + @Mock + private SwitchPreference mPreference; + @Mock + private PreferenceScreen mPreferenceScreen; + + private Context mContext; + private ShowLayoutBoundsPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = new ShowLayoutBoundsPreferenceController(mContext); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( + mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @After + public void tearDown() { + SettingsShadowSystemProperties.clear(); + } + + @Test + public void onPreferenceChanged_settingEnabled_turnOnShowLayoutBounds() { + mController.onPreferenceChange(mPreference, true /* new value */); + + final boolean mode = SettingsShadowSystemProperties.getBoolean( + View.DEBUG_LAYOUT_PROPERTY, false /* default */); + + assertThat(mode).isTrue(); + } + + @Test + public void onPreferenceChanged_settingDisabled_turnOffShowLayoutBounds() { + mController.onPreferenceChange(mPreference, false /* new value */); + + final boolean mode = SettingsShadowSystemProperties.getBoolean( + View.DEBUG_LAYOUT_PROPERTY, false /* default */); + + assertThat(mode).isFalse(); + } + + @Test + public void updateState_settingEnabled_preferenceShouldBeChecked() { + SettingsShadowSystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, + Boolean.toString(true)); + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_settingDisabled_preferenceShouldNotBeChecked() { + SettingsShadowSystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, + Boolean.toString(false)); + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsDisabled(); + + final boolean mode = SettingsShadowSystemProperties.getBoolean( + View.DEBUG_LAYOUT_PROPERTY, false /* default */); + + assertThat(mode).isFalse(); + verify(mPreference).setEnabled(false); + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsEnabled_shouldEnablePreference() { + mController.onDeveloperOptionsEnabled(); + + verify(mPreference).setEnabled(true); + } +}