summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-11-07 15:53:59 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-07 15:53:59 -0800
commite7c44c2871ea595c8c3f879f19e8790083dbb84c (patch)
tree46b59b89255c5215b68a7004a69af17498768c7d
parent5f25258f9a0959b103956c4e449c8326d991bff2 (diff)
parent164f74e38918ea01a5f631a7cf4d807d397c6a51 (diff)
downloadpackages_apps_Browser-e7c44c2871ea595c8c3f879f19e8790083dbb84c.zip
packages_apps_Browser-e7c44c2871ea595c8c3f879f19e8790083dbb84c.tar.gz
packages_apps_Browser-e7c44c2871ea595c8c3f879f19e8790083dbb84c.tar.bz2
Merge "Add support to minimize the WebView's memory consumption by default" into ics-mr1
-rw-r--r--src/com/android/browser/BrowserSettings.java7
-rw-r--r--src/com/android/browser/WebViewProperties.java1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index e2a521a..0b8191a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -301,6 +301,13 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
// enable smooth transition for better performance during panning or
// zooming
settings.setEnableSmoothTransition(true);
+ // WebView should be preserving the memory as much as possible.
+ // However, apps like browser wish to turn on the performance mode which
+ // would require more memory.
+ // TODO: We need to dynamically allocate/deallocate temporary memory for
+ // apps which are trying to use minimal memory. Currently, double
+ // buffering is always turned on, which is unnecessary.
+ settings.setProperty(WebViewProperties.gfxUseMinimalMemory, "false");
// disable content url access
settings.setAllowContentAccess(false);
diff --git a/src/com/android/browser/WebViewProperties.java b/src/com/android/browser/WebViewProperties.java
index c410038..c662957 100644
--- a/src/com/android/browser/WebViewProperties.java
+++ b/src/com/android/browser/WebViewProperties.java
@@ -19,4 +19,5 @@ public interface WebViewProperties {
static final String gfxInvertedScreen = "inverted";
static final String gfxInvertedScreenContrast = "inverted_contrast";
static final String gfxEnableCpuUploadPath = "enable_cpu_upload_path";
+ static final String gfxUseMinimalMemory = "use_minimal_memory";
}