diff options
| author | 2012-07-31 05:08:22 -0700 | |
|---|---|---|
| committer | 2012-07-31 05:08:23 -0700 | |
| commit | f415f3d72bbea4c08f6d52b74bb207b587cde722 (patch) | |
| tree | 8c7c0aefb98fcefd22860296df19e4e84070d91d | |
| parent | 150275ec72b67591c368446e2113e3c950e12ace (diff) | |
| parent | 56936a1f5122f890e87e44d7b5f2fb6c9bfd50d8 (diff) | |
Merge "Deprecate WebSettings.LOAD_NORMAL cache mode."
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index d37b292216a6..45a0bb81dc9b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26739,7 +26739,7 @@ package android.webkit { field public static final int LOAD_CACHE_ELSE_NETWORK = 1; // 0x1 field public static final int LOAD_CACHE_ONLY = 3; // 0x3 field public static final int LOAD_DEFAULT = -1; // 0xffffffff - field public static final int LOAD_NORMAL = 0; // 0x0 + field public static final deprecated int LOAD_NORMAL = 0; // 0x0 field public static final int LOAD_NO_CACHE = 2; // 0x2 } diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 49453708baee..cb5460084b1d 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}. * |