Loading src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java 0 → 100644 +103 −0 Original line number Diff line number Diff line /* * 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.v7.preference.ListPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; public class DebugNonRectClipOperationsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip"; private final String[] mListValues; private final String[] mListSummaries; private ListPreference mPreference; public DebugNonRectClipOperationsPreferenceController(Context context) { super(context); mListValues = context.getResources().getStringArray(R.array.show_non_rect_clip_values); mListSummaries = context.getResources().getStringArray(R.array.show_non_rect_clip_entries); } @Override public String getPreferenceKey() { return SHOW_NON_RECTANGULAR_CLIP_KEY; } @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); mPreference = (ListPreference) screen.findPreference(getPreferenceKey()); } @Override public boolean onPreferenceChange(Preference preference, Object newValue) { writeShowNonRectClipOptions(newValue); updateShowNonRectClipOptions(); return true; } @Override public void updateState(Preference preference) { updateShowNonRectClipOptions(); } @Override protected void onDeveloperOptionsSwitchEnabled() { mPreference.setEnabled(true); } @Override protected void onDeveloperOptionsSwitchDisabled() { mPreference.setEnabled(false); } private void writeShowNonRectClipOptions(Object newValue) { SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, newValue == null ? "" : newValue.toString()); SystemPropPoker.getInstance().poke(); } private void updateShowNonRectClipOptions() { final String value = SystemProperties.get( ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, "hide" /* default */); int index = 0; // default for (int i = 0; i < mListValues.length; i++) { if (TextUtils.equals(value, mListValues[i])) { index = i; break; } } mPreference.setValue(mListValues[index]); mPreference.setSummary(mListSummaries[index]); } } src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +1 −1 Original line number Diff line number Diff line Loading @@ -397,7 +397,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new GpuViewUpdatesPreferenceController(context)); controllers.add(new HardwareLayersUpdatesPreferenceController(context)); controllers.add(new DebugGpuOverdrawPreferenceController(context)); // debug non-rectangular clip operations controllers.add(new DebugNonRectClipOperationsPreferenceController(context)); controllers.add(new ForceMSAAPreferenceController(context)); controllers.add(new HardwareOverlaysPreferenceController(context)); controllers.add(new SimulateColorSpacePreferenceController(context)); Loading tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java 0 → 100644 +144 −0 Original line number Diff line number Diff line /* * 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.os.SystemProperties; import android.support.v7.preference.ListPreference; import android.support.v7.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.R; 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 DebugNonRectClipOperationsPreferenceControllerTest { @Mock private ListPreference mPreference; @Mock private PreferenceScreen mScreen; /** * 0: off * 1: Draw non-rectangular clip region in blue * 2: Highlight tested drawing commands in green */ private String[] mListValues; private String[] mListSummaries; private Context mContext; private DebugNonRectClipOperationsPreferenceController mController; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mListValues = mContext.getResources().getStringArray(R.array.show_non_rect_clip_values); mListSummaries = mContext.getResources().getStringArray(R.array.show_non_rect_clip_entries); mController = new DebugNonRectClipOperationsPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); } @After public void teardown() { SettingsShadowSystemProperties.clear(); } @Test public void onPreferenceChange_noValueSet_shouldSetEmptyString() { mController.onPreferenceChange(mPreference, null /* new value */); String mode = SystemProperties.get( ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY); assertThat(mode).isEqualTo(""); } @Test public void onPreferenceChange_option1Selected_shouldSetOption1() { mController.onPreferenceChange(mPreference, mListValues[1]); String mode = SystemProperties.get( ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY); assertThat(mode).isEqualTo(mListValues[1]); } @Test public void updateState_option1Set_shouldUpdatePreferenceToOption1() { SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, mListValues[1]); mController.updateState(mPreference); verify(mPreference).setValue(mListValues[1]); verify(mPreference).setSummary(mListSummaries[1]); } @Test public void updateState_option2Set_shouldUpdatePreferenceToOption2() { SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, mListValues[2]); mController.updateState(mPreference); verify(mPreference).setValue(mListValues[2]); verify(mPreference).setSummary(mListSummaries[2]); } @Test public void updateState_noOptionSet_shouldDefaultToOption0() { SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, null); mController.updateState(mPreference); verify(mPreference).setValue(mListValues[0]); verify(mPreference).setSummary(mListSummaries[0]); } @Test public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() { mController.onDeveloperOptionsSwitchDisabled(); verify(mPreference).setEnabled(false); } @Test public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() { mController.onDeveloperOptionsSwitchEnabled(); verify(mPreference).setEnabled(true); } } Loading
src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java 0 → 100644 +103 −0 Original line number Diff line number Diff line /* * 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.v7.preference.ListPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; public class DebugNonRectClipOperationsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip"; private final String[] mListValues; private final String[] mListSummaries; private ListPreference mPreference; public DebugNonRectClipOperationsPreferenceController(Context context) { super(context); mListValues = context.getResources().getStringArray(R.array.show_non_rect_clip_values); mListSummaries = context.getResources().getStringArray(R.array.show_non_rect_clip_entries); } @Override public String getPreferenceKey() { return SHOW_NON_RECTANGULAR_CLIP_KEY; } @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); mPreference = (ListPreference) screen.findPreference(getPreferenceKey()); } @Override public boolean onPreferenceChange(Preference preference, Object newValue) { writeShowNonRectClipOptions(newValue); updateShowNonRectClipOptions(); return true; } @Override public void updateState(Preference preference) { updateShowNonRectClipOptions(); } @Override protected void onDeveloperOptionsSwitchEnabled() { mPreference.setEnabled(true); } @Override protected void onDeveloperOptionsSwitchDisabled() { mPreference.setEnabled(false); } private void writeShowNonRectClipOptions(Object newValue) { SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, newValue == null ? "" : newValue.toString()); SystemPropPoker.getInstance().poke(); } private void updateShowNonRectClipOptions() { final String value = SystemProperties.get( ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, "hide" /* default */); int index = 0; // default for (int i = 0; i < mListValues.length; i++) { if (TextUtils.equals(value, mListValues[i])) { index = i; break; } } mPreference.setValue(mListValues[index]); mPreference.setSummary(mListSummaries[index]); } }
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +1 −1 Original line number Diff line number Diff line Loading @@ -397,7 +397,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new GpuViewUpdatesPreferenceController(context)); controllers.add(new HardwareLayersUpdatesPreferenceController(context)); controllers.add(new DebugGpuOverdrawPreferenceController(context)); // debug non-rectangular clip operations controllers.add(new DebugNonRectClipOperationsPreferenceController(context)); controllers.add(new ForceMSAAPreferenceController(context)); controllers.add(new HardwareOverlaysPreferenceController(context)); controllers.add(new SimulateColorSpacePreferenceController(context)); Loading
tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java 0 → 100644 +144 −0 Original line number Diff line number Diff line /* * 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.os.SystemProperties; import android.support.v7.preference.ListPreference; import android.support.v7.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.R; 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 DebugNonRectClipOperationsPreferenceControllerTest { @Mock private ListPreference mPreference; @Mock private PreferenceScreen mScreen; /** * 0: off * 1: Draw non-rectangular clip region in blue * 2: Highlight tested drawing commands in green */ private String[] mListValues; private String[] mListSummaries; private Context mContext; private DebugNonRectClipOperationsPreferenceController mController; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mListValues = mContext.getResources().getStringArray(R.array.show_non_rect_clip_values); mListSummaries = mContext.getResources().getStringArray(R.array.show_non_rect_clip_entries); mController = new DebugNonRectClipOperationsPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); } @After public void teardown() { SettingsShadowSystemProperties.clear(); } @Test public void onPreferenceChange_noValueSet_shouldSetEmptyString() { mController.onPreferenceChange(mPreference, null /* new value */); String mode = SystemProperties.get( ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY); assertThat(mode).isEqualTo(""); } @Test public void onPreferenceChange_option1Selected_shouldSetOption1() { mController.onPreferenceChange(mPreference, mListValues[1]); String mode = SystemProperties.get( ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY); assertThat(mode).isEqualTo(mListValues[1]); } @Test public void updateState_option1Set_shouldUpdatePreferenceToOption1() { SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, mListValues[1]); mController.updateState(mPreference); verify(mPreference).setValue(mListValues[1]); verify(mPreference).setSummary(mListSummaries[1]); } @Test public void updateState_option2Set_shouldUpdatePreferenceToOption2() { SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, mListValues[2]); mController.updateState(mPreference); verify(mPreference).setValue(mListValues[2]); verify(mPreference).setSummary(mListSummaries[2]); } @Test public void updateState_noOptionSet_shouldDefaultToOption0() { SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, null); mController.updateState(mPreference); verify(mPreference).setValue(mListValues[0]); verify(mPreference).setSummary(mListSummaries[0]); } @Test public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() { mController.onDeveloperOptionsSwitchDisabled(); verify(mPreference).setEnabled(false); } @Test public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() { mController.onDeveloperOptionsSwitchEnabled(); verify(mPreference).setEnabled(true); } }