summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMikhail Naganov <mnaganov@google.com>2012-07-25 13:07:18 +0100
committerMikhail Naganov <mnaganov@google.com>2012-07-30 14:54:49 +0100
commit56936a1f5122f890e87e44d7b5f2fb6c9bfd50d8 (patch)
tree9304da4f4d72aa3ea81de8c3d49decfdb97b77bc /core
parentc58392bc2905b0e50ff26340d47c970e78752b99 (diff)
downloadframeworks_base-56936a1f5122f890e87e44d7b5f2fb6c9bfd50d8.zip
frameworks_base-56936a1f5122f890e87e44d7b5f2fb6c9bfd50d8.tar.gz
frameworks_base-56936a1f5122f890e87e44d7b5f2fb6c9bfd50d8.tar.bz2
Deprecate WebSettings.LOAD_NORMAL cache mode.
After the switch to the Chromium network stack, this setting is effectively the same as LOAD_DEFAULT, and having two settings with the same meaning is confusing. This change is blocking https://android-git.corp.google.com/g/205883 in CTS Change-Id: I02cc23477f107e7f4cec37dcbad4f25503b5e840
Diffstat (limited to 'core')
-rw-r--r--core/java/android/webkit/WebSettings.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 193e98d..79b43b7 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -103,6 +103,10 @@ public abstract class WebSettings {
/**
* Normal cache usage mode. Use with {@link #setCacheMode}.
+ *
+ * @deprecated This value is obsolete, as from API level
+ * {@link android.os.Build.VERSION_CODES#HONEYCOMB} and onwards it has the
+ * same effect as {@link #LOAD_DEFAULT}.
*/
public static final int LOAD_NORMAL = 0;
@@ -1253,7 +1257,7 @@ public abstract class WebSettings {
* and content is re-validated as needed. When navigating back, content is
* not revalidated, instead the content is just retrieved from the cache.
* This method allows the client to override this behavior by specifying
- * one of {@link #LOAD_DEFAULT}, {@link #LOAD_NORMAL},
+ * one of {@link #LOAD_DEFAULT},
* {@link #LOAD_CACHE_ELSE_NETWORK}, {@link #LOAD_NO_CACHE} or
* {@link #LOAD_CACHE_ONLY}. The default value is {@link #LOAD_DEFAULT}.
*