am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1 (2c6afef8) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -25152,7 +25152,7 @@ package android.webkit {
		method public synchronized java.lang.String getFixedFontFamily();
		method public synchronized boolean getJavaScriptCanOpenWindowsAutomatically();
		method public synchronized boolean getJavaScriptEnabled();
		method public deprecated synchronized android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm();
		method public synchronized android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm();
		method public boolean getLightTouchEnabled();
		method public boolean getLoadWithOverviewMode();
		method public synchronized boolean getLoadsImagesAutomatically();
		@@ -25199,7 +25199,7 @@ package android.webkit {
		method public synchronized void setGeolocationEnabled(boolean);
		method public synchronized void setJavaScriptCanOpenWindowsAutomatically(boolean);
		method public synchronized void setJavaScriptEnabled(boolean);
		method public deprecated synchronized void setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm);
		method public synchronized void setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm);
		method public void setLightTouchEnabled(boolean);
		method public void setLoadWithOverviewMode(boolean);
		method public synchronized void setLoadsImagesAutomatically(boolean);
		@@ -25234,12 +25234,12 @@ package android.webkit {
		field public static final int LOAD_NO_CACHE = 2; // 0x2
		}

		public static final deprecated class WebSettings.LayoutAlgorithm extends java.lang.Enum {
		public static final class WebSettings.LayoutAlgorithm extends java.lang.Enum {
		method public static android.webkit.WebSettings.LayoutAlgorithm valueOf(java.lang.String);
		method public static final android.webkit.WebSettings.LayoutAlgorithm[] values();
		enum_constant public static final android.webkit.WebSettings.LayoutAlgorithm NARROW_COLUMNS;
		enum_constant public static final android.webkit.WebSettings.LayoutAlgorithm NORMAL;
		enum_constant public static final android.webkit.WebSettings.LayoutAlgorithm SINGLE_COLUMN;
		enum_constant public static final deprecated android.webkit.WebSettings.LayoutAlgorithm SINGLE_COLUMN;
		}

		public static final class WebSettings.PluginState extends java.lang.Enum {

core/java/android/webkit/WebSettings.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -42,12 +42,14 @@ public class WebSettings {
		* SINGLE_COLUMN moves all content into one column that is the width of the
		* view.
		* NARROW_COLUMNS makes all columns no wider than the screen if possible.
		* @deprecated This enum is now obsolete.
		*/
		// XXX: These must match LayoutAlgorithm in Settings.h in WebCore.
		@Deprecated
		public enum LayoutAlgorithm {
		NORMAL,
		/**
		* @deprecated This algorithm is now obsolete.
		*/
		@Deprecated
		SINGLE_COLUMN,
		NARROW_COLUMNS
		}
		@@ -936,9 +938,7 @@ public class WebSettings {
		* WebView.
		* @param l A LayoutAlgorithm enum specifying the algorithm to use.
		* @see WebSettings.LayoutAlgorithm
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public synchronized void setLayoutAlgorithm(LayoutAlgorithm l) {
		// XXX: This will only be affective if libwebcore was built with
		// ANDROID_LAYOUT defined.
		@@ -953,9 +953,7 @@ public class WebSettings {
		* @return LayoutAlgorithm enum value describing the layout algorithm
		* being used.
		* @see WebSettings.LayoutAlgorithm
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public synchronized LayoutAlgorithm getLayoutAlgorithm() {
		return mLayoutAlgorithm;
		}