Merge "Introduce ForceMsaaPreferenceController"
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 9b9bc98..320bbcd 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -297,7 +297,7 @@
controllers.add(new HardwareLayersUpdatesPreferenceController(context));
// debug gpu overdraw
// debug non-rectangular clip operations
- // force 4x msaa
+ controllers.add(new ForceMSAAPreferenceController(context));
// disable hw overlays
// simulate color space
// set gpu renderer
diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java
new file mode 100644
index 0000000..69436be
--- /dev/null
+++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java
@@ -0,0 +1,80 @@
+/*
+ * 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.annotation.VisibleForTesting;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settingslib.development.SystemPropPoker;
+
+public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ private static final String FORCE_MSAA_KEY = "force_msaa";
+
+ @VisibleForTesting
+ static final String MSAA_PROPERTY = "debug.egl.force_msaa";
+
+ private SwitchPreference mPreference;
+
+ public ForceMSAAPreferenceController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return FORCE_MSAA_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(MSAA_PROPERTY,
+ isEnabled ? Boolean.toString(true) : Boolean.toString(false));
+ SystemPropPoker.getInstance().poke();
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final boolean isEnabled = SystemProperties.getBoolean(MSAA_PROPERTY, false /* default */);
+ mPreference.setChecked(isEnabled);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchEnabled() {
+ mPreference.setEnabled(true);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ SystemProperties.set(MSAA_PROPERTY, Boolean.toString(false));
+ mPreference.setChecked(false);
+ mPreference.setEnabled(false);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
new file mode 100644
index 0000000..ca1ff08
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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 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 ForceMSAAPreferenceControllerTest {
+
+ @Mock
+ private SwitchPreference mPreference;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+
+ private Context mContext;
+ private ForceMSAAPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new ForceMSAAPreferenceController(mContext);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @After
+ public void tearDown() {
+ SettingsShadowSystemProperties.clear();
+ }
+
+ @Test
+ public void onPreferenceChanged_settingEnabled_turnOnForceMsaa() {
+ mController.onPreferenceChange(mPreference, true /* new value */);
+
+ final boolean mode = SettingsShadowSystemProperties.getBoolean(
+ ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+
+ assertThat(mode).isTrue();
+ }
+
+ @Test
+ public void onPreferenceChanged_settingDisabled_turnOffForceMsaa() {
+ mController.onPreferenceChange(mPreference, false /* new value */);
+
+ final boolean mode = SettingsShadowSystemProperties.getBoolean(
+ ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+
+ assertThat(mode).isFalse();
+ }
+
+ @Test
+ public void updateState_settingEnabled_preferenceShouldBeChecked() {
+ SettingsShadowSystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY,
+ Boolean.toString(true));
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+ SettingsShadowSystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY,
+ Boolean.toString(false));
+ 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();
+
+ final boolean mode = SettingsShadowSystemProperties.getBoolean(
+ ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+
+ assertThat(mode).isFalse();
+ verify(mPreference).setEnabled(true);
+ }
+}