Commit fb2ca7c2 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review

Merge "Update for rename"

parents e44fce2c b2b44a47
...@@ -66,7 +66,7 @@ import android.support.v7.preference.PreferenceGroup; ...@@ -66,7 +66,7 @@ import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.HardwareRenderer; import android.view.ThreadedRenderer;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -1023,7 +1023,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment ...@@ -1023,7 +1023,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} }
private void updateTrackFrameTimeOptions() { private void updateTrackFrameTimeOptions() {
String value = SystemProperties.get(HardwareRenderer.PROFILE_PROPERTY); String value = SystemProperties.get(ThreadedRenderer.PROFILE_PROPERTY);
if (value == null) { if (value == null) {
value = ""; value = "";
} }
...@@ -1041,7 +1041,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment ...@@ -1041,7 +1041,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} }
private void writeTrackFrameTimeOptions(Object newValue) { private void writeTrackFrameTimeOptions(Object newValue) {
SystemProperties.set(HardwareRenderer.PROFILE_PROPERTY, SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY,
newValue == null ? "" : newValue.toString()); newValue == null ? "" : newValue.toString());
pokeSystemProperties(); pokeSystemProperties();
updateTrackFrameTimeOptions(); updateTrackFrameTimeOptions();
...@@ -1049,7 +1049,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment ...@@ -1049,7 +1049,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private void updateShowNonRectClipOptions() { private void updateShowNonRectClipOptions() {
String value = SystemProperties.get( String value = SystemProperties.get(
HardwareRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY); ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY);
if (value == null) { if (value == null) {
value = "hide"; value = "hide";
} }
...@@ -1067,7 +1067,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment ...@@ -1067,7 +1067,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} }
private void writeShowNonRectClipOptions(Object newValue) { private void writeShowNonRectClipOptions(Object newValue) {
SystemProperties.set(HardwareRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY,
newValue == null ? "" : newValue.toString()); newValue == null ? "" : newValue.toString());
pokeSystemProperties(); pokeSystemProperties();
updateShowNonRectClipOptions(); updateShowNonRectClipOptions();
...@@ -1075,28 +1075,28 @@ public class DevelopmentSettings extends SettingsPreferenceFragment ...@@ -1075,28 +1075,28 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private void updateShowHwScreenUpdatesOptions() { private void updateShowHwScreenUpdatesOptions() {
updateSwitchPreference(mShowHwScreenUpdates, updateSwitchPreference(mShowHwScreenUpdates,
SystemProperties.getBoolean(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false)); SystemProperties.getBoolean(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false));
} }
private void writeShowHwScreenUpdatesOptions() { private void writeShowHwScreenUpdatesOptions() {
SystemProperties.set(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
mShowHwScreenUpdates.isChecked() ? "true" : null); mShowHwScreenUpdates.isChecked() ? "true" : null);
pokeSystemProperties(); pokeSystemProperties();
} }
private void updateShowHwLayersUpdatesOptions() { private void updateShowHwLayersUpdatesOptions() {
updateSwitchPreference(mShowHwLayersUpdates, SystemProperties.getBoolean( updateSwitchPreference(mShowHwLayersUpdates, SystemProperties.getBoolean(
HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false)); ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false));
} }
private void writeShowHwLayersUpdatesOptions() { private void writeShowHwLayersUpdatesOptions() {
SystemProperties.set(HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
mShowHwLayersUpdates.isChecked() ? "true" : null); mShowHwLayersUpdates.isChecked() ? "true" : null);
pokeSystemProperties(); pokeSystemProperties();
} }
private void updateDebugHwOverdrawOptions() { private void updateDebugHwOverdrawOptions() {
String value = SystemProperties.get(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY); String value = SystemProperties.get(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY);
if (value == null) { if (value == null) {
value = ""; value = "";
} }
...@@ -1114,7 +1114,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment ...@@ -1114,7 +1114,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} }
private void writeDebugHwOverdrawOptions(Object newValue) { private void writeDebugHwOverdrawOptions(Object newValue) {
SystemProperties.set(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY, SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY,
newValue == null ? "" : newValue.toString()); newValue == null ? "" : newValue.toString());
pokeSystemProperties(); pokeSystemProperties();
updateDebugHwOverdrawOptions(); updateDebugHwOverdrawOptions();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment