Merge "Deprecate WebSettings.LOAD_NORMAL cache mode." (f415f3d7) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -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}.
		*