From 56936a1f5122f890e87e44d7b5f2fb6c9bfd50d8 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Wed, 25 Jul 2012 13:07:18 +0100 Subject: 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 --- core/java/android/webkit/WebSettings.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'core/java/android/webkit/WebSettings.java') diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 193e98d0ab10..79b43b7f1012 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}. * -- cgit v1.2.3