diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index cdd2c458c35..7bb522e3a7e 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -642,6 +642,12 @@
             android:summary="%s"
             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
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 196812ddce3..1f5f6a86fee 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -798,6 +798,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new ForceMSAAPreferenceController(context));
         controllers.add(new HardwareOverlaysPreferenceController(context));
         controllers.add(new SimulateColorSpacePreferenceController(context));
+        controllers.add(new SetGpuRendererPreferenceController(context));
         controllers.add(new UsbAudioRoutingPreferenceController(context));
         controllers.add(new StrictModePreferenceController(context));
         controllers.add(new ProfileGpuRenderingPreferenceController(context));
diff --git a/src/com/android/settings/development/SetGpuRendererPreferenceController.java b/src/com/android/settings/development/SetGpuRendererPreferenceController.java
new file mode 100644
index 00000000000..07b37514ca3
--- /dev/null
+++ b/src/com/android/settings/development/SetGpuRendererPreferenceController.java
@@ -0,0 +1,102 @@
+/*
+ * 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 androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.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(com.android.settingslib.R.array.debug_hw_renderer_values);
+        mListSummaries = context.getResources().getStringArray(com.android.settingslib.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]);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/SetGpuRendererPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SetGpuRendererPreferenceControllerTest.java
new file mode 100644
index 00000000000..4309c6d780b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SetGpuRendererPreferenceControllerTest.java
@@ -0,0 +1,143 @@
+/*
+ * 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 androidx.preference.ListPreference;
+import androidx.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);
+    }
+}