Merge "Revert "Add developer setting to set the default GPU renderer.""
This commit is contained in:
TreeHugger Robot
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
cada64beef
@@ -423,12 +423,6 @@
|
|||||||
android:summary="%s"
|
android:summary="%s"
|
||||||
android:title="@string/simulate_color_space" />
|
android:title="@string/simulate_color_space" />
|
||||||
|
|
||||||
<ListPreference
|
|
||||||
android:key="debug_hw_renderer"
|
|
||||||
android:title="@string/debug_hw_renderer"
|
|
||||||
android:entries="@array/debug_hw_renderer_entries"
|
|
||||||
android:entryValues="@array/debug_hw_renderer_values" />
|
|
||||||
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
|
|||||||
@@ -435,7 +435,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new ForceMSAAPreferenceController(context));
|
controllers.add(new ForceMSAAPreferenceController(context));
|
||||||
controllers.add(new HardwareOverlaysPreferenceController(context));
|
controllers.add(new HardwareOverlaysPreferenceController(context));
|
||||||
controllers.add(new SimulateColorSpacePreferenceController(context));
|
controllers.add(new SimulateColorSpacePreferenceController(context));
|
||||||
controllers.add(new SetGpuRendererPreferenceController(context));
|
|
||||||
controllers.add(new UsbAudioRoutingPreferenceController(context));
|
controllers.add(new UsbAudioRoutingPreferenceController(context));
|
||||||
controllers.add(new StrictModePreferenceController(context));
|
controllers.add(new StrictModePreferenceController(context));
|
||||||
controllers.add(new ProfileGpuRenderingPreferenceController(context));
|
controllers.add(new ProfileGpuRenderingPreferenceController(context));
|
||||||
|
|||||||
@@ -1,102 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 SetGpuRendererPreferenceController extends
|
|
||||||
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
|
|
||||||
PreferenceControllerMixin {
|
|
||||||
|
|
||||||
private static final String DEBUG_HW_RENDERER_KEY = "debug_hw_renderer";
|
|
||||||
|
|
||||||
private final String[] mListValues;
|
|
||||||
private final String[] mListSummaries;
|
|
||||||
private ListPreference mPreference;
|
|
||||||
|
|
||||||
public SetGpuRendererPreferenceController(Context context) {
|
|
||||||
super(context);
|
|
||||||
|
|
||||||
mListValues = context.getResources().getStringArray(R.array.debug_hw_renderer_values);
|
|
||||||
mListSummaries = context.getResources().getStringArray(R.array.debug_hw_renderer_entries);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPreferenceKey() {
|
|
||||||
return DEBUG_HW_RENDERER_KEY;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void displayPreference(PreferenceScreen screen) {
|
|
||||||
super.displayPreference(screen);
|
|
||||||
|
|
||||||
mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
||||||
writeDebugHwRendererOptions(newValue);
|
|
||||||
updateDebugHwRendererOptions();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateState(Preference preference) {
|
|
||||||
updateDebugHwRendererOptions();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchEnabled() {
|
|
||||||
mPreference.setEnabled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchDisabled() {
|
|
||||||
mPreference.setEnabled(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void writeDebugHwRendererOptions(Object newValue) {
|
|
||||||
SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
|
|
||||||
newValue == null ? "" : newValue.toString());
|
|
||||||
SystemPropPoker.getInstance().poke();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateDebugHwRendererOptions() {
|
|
||||||
final String value = SystemProperties.get(
|
|
||||||
ThreadedRenderer.DEBUG_RENDERER_PROPERTY, "" /* 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]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,143 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 SetGpuRendererPreferenceControllerTest {
|
|
||||||
|
|
||||||
@Mock
|
|
||||||
private ListPreference mPreference;
|
|
||||||
@Mock
|
|
||||||
private PreferenceScreen mScreen;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 0: OpenGl (Default)
|
|
||||||
* 1: OpenGl (Skia)
|
|
||||||
*/
|
|
||||||
private String[] mListValues;
|
|
||||||
private String[] mListSummaries;
|
|
||||||
private Context mContext;
|
|
||||||
private SetGpuRendererPreferenceController mController;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setup() {
|
|
||||||
MockitoAnnotations.initMocks(this);
|
|
||||||
mContext = RuntimeEnvironment.application;
|
|
||||||
mListValues = mContext.getResources().getStringArray(R.array.debug_hw_renderer_values);
|
|
||||||
mListSummaries = mContext.getResources().getStringArray(R.array.debug_hw_renderer_entries);
|
|
||||||
mController = new SetGpuRendererPreferenceController(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_RENDERER_PROPERTY);
|
|
||||||
assertThat(mode).isEqualTo("");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void onPreferenceChange_option1Selected_shouldSetOption1() {
|
|
||||||
mController.onPreferenceChange(mPreference, mListValues[1]);
|
|
||||||
|
|
||||||
String mode = SystemProperties.get(
|
|
||||||
ThreadedRenderer.DEBUG_RENDERER_PROPERTY);
|
|
||||||
assertThat(mode).isEqualTo(mListValues[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void updateState_option1Set_shouldUpdatePreferenceToOption1() {
|
|
||||||
SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
|
|
||||||
mListValues[1]);
|
|
||||||
|
|
||||||
mController.updateState(mPreference);
|
|
||||||
|
|
||||||
verify(mPreference).setValue(mListValues[1]);
|
|
||||||
verify(mPreference).setSummary(mListSummaries[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void updateState_option0Set_shouldUpdatePreferenceToOption0() {
|
|
||||||
SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_PROPERTY,
|
|
||||||
mListValues[0]);
|
|
||||||
|
|
||||||
mController.updateState(mPreference);
|
|
||||||
|
|
||||||
verify(mPreference).setValue(mListValues[0]);
|
|
||||||
verify(mPreference).setSummary(mListSummaries[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void updateState_noOptionSet_shouldDefaultToOption0() {
|
|
||||||
SystemProperties.set(ThreadedRenderer.DEBUG_RENDERER_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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user