diff options
author | John Reck <jreck@google.com> | 2011-10-05 11:22:48 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-05 11:22:48 -0700 |
commit | fbc543f721df441b2140349509d3b7bfe27001c8 (patch) | |
tree | edbf0a0279a61293e6da9b5535a5a5e0041a3122 /src/com | |
parent | 53ed62c0171fdbaecaccfbbb08cbf22cb08d39a5 (diff) | |
parent | 1da8188e950f6e68e1edd44fb5b5dbfc8cc2c349 (diff) | |
download | packages_apps_Browser-fbc543f721df441b2140349509d3b7bfe27001c8.zip packages_apps_Browser-fbc543f721df441b2140349509d3b7bfe27001c8.tar.gz packages_apps_Browser-fbc543f721df441b2140349509d3b7bfe27001c8.tar.bz2 |
Merge "Disable hardware skia when debug is disabled"
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/browser/BrowserSettings.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index b9eec9c..5920e58 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -20,6 +20,7 @@ import android.app.ActivityManager; import android.content.ContentResolver; import android.content.Context; import android.content.SharedPreferences; +import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Build; import android.os.Message; @@ -427,7 +428,13 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, } public void setDebugEnabled(boolean value) { - mPrefs.edit().putBoolean(PREF_DEBUG_MENU, value).apply(); + Editor edit = mPrefs.edit(); + edit.putBoolean(PREF_DEBUG_MENU, value); + if (!value) { + // Reset to "safe" value + edit.putBoolean(PREF_ENABLE_HARDWARE_ACCEL_SKIA, false); + } + edit.apply(); } public void clearCache() { |