summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebSettings.java
diff options
context:
space:
mode:
authorMikhail Naganov <mnaganov@google.com>2012-07-31 05:08:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-31 05:08:23 -0700
commitf415f3d72bbea4c08f6d52b74bb207b587cde722 (patch)
tree8c7c0aefb98fcefd22860296df19e4e84070d91d /core/java/android/webkit/WebSettings.java
parent150275ec72b67591c368446e2113e3c950e12ace (diff)
parent56936a1f5122f890e87e44d7b5f2fb6c9bfd50d8 (diff)
downloadframeworks_base-f415f3d72bbea4c08f6d52b74bb207b587cde722.zip
frameworks_base-f415f3d72bbea4c08f6d52b74bb207b587cde722.tar.gz
frameworks_base-f415f3d72bbea4c08f6d52b74bb207b587cde722.tar.bz2
Merge "Deprecate WebSettings.LOAD_NORMAL cache mode."
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
-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 4945370..cb54600 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -119,6 +119,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;
@@ -1269,7 +1273,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}.
*