am 9f5f7af6: Deprecating webkit API\'s that might not be supported in the future do not merge (6d7d68da) · Commits · e / os / android_frameworks_base

api/12.xml

+17 −17

Original line number	Diff line number	Diff line
		@@ -235596,7 +235596,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -236083,7 +236083,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -236149,7 +236149,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -236270,7 +236270,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -236639,7 +236639,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="l" type="android.webkit.WebSettings.LayoutAlgorithm">
		@@ -236717,7 +236717,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="enabled" type="boolean">
		@@ -236912,7 +236912,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="view" type="boolean">
		@@ -237040,7 +237040,7 @@
		abstract="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="valueOf"
		@@ -237726,7 +237726,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -237748,7 +237748,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -237772,7 +237772,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -237783,7 +237783,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -238320,7 +238320,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="b" type="android.os.Bundle">
		@@ -238376,7 +238376,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="b" type="android.os.Bundle">
		@@ -238531,7 +238531,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="listener" type="android.webkit.WebView.PictureListener">
		@@ -238803,7 +238803,7 @@
		abstract="true"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="onNewPicture"
		@@ -238813,7 +238813,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="view" type="android.webkit.WebView">

api/current.xml

+17 −17

Original line number	Diff line number	Diff line
		@@ -240923,7 +240923,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -241410,7 +241410,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -241476,7 +241476,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -241597,7 +241597,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -241966,7 +241966,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="l" type="android.webkit.WebSettings.LayoutAlgorithm">
		@@ -242044,7 +242044,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="enabled" type="boolean">
		@@ -242239,7 +242239,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="view" type="boolean">
		@@ -242367,7 +242367,7 @@
		abstract="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="valueOf"
		@@ -243053,7 +243053,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -243075,7 +243075,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -243099,7 +243099,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -243110,7 +243110,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -243647,7 +243647,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="b" type="android.os.Bundle">
		@@ -243703,7 +243703,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="b" type="android.os.Bundle">
		@@ -243858,7 +243858,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="listener" type="android.webkit.WebView.PictureListener">
		@@ -244130,7 +244130,7 @@
		abstract="true"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="onNewPicture"
		@@ -244140,7 +244140,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="view" type="android.webkit.WebView">

core/java/android/webkit/WebHistoryItem.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -90,7 +90,9 @@ public class WebHistoryItem implements Cloneable {
		* another item, the identifiers will be the same even if they are not the
		* same object.
		* @return The id for this item.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public int getId() {
		return mId;
		}

core/java/android/webkit/WebSettings.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -43,8 +43,10 @@ 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,
		SINGLE_COLUMN,
		@@ -510,14 +512,18 @@ public class WebSettings {

		/**
		* Enables dumping the pages navigation cache to a text file.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public void setNavDump(boolean enabled) {
		mNavDump = enabled;
		}

		/**
		* Returns true if dumping the navigation cache is enabled.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public boolean getNavDump() {
		return mNavDump;
		}
		@@ -655,7 +661,9 @@ public class WebSettings {
		* Set whether the WebView uses its background for over scroll background.
		* If true, it will use the WebView's background. If false, it will use an
		* internal pattern. Default is true.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public void setUseWebViewBackgroundForOverscrollBackground(boolean view) {
		mUseWebViewBackgroundForOverscroll = view;
		}
		@@ -663,7 +671,9 @@ public class WebSettings {
		/**
		* Returns true if this WebView uses WebView's background instead of
		* internal pattern for over scroll background.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public boolean getUseWebViewBackgroundForOverscrollBackground() {
		return mUseWebViewBackgroundForOverscroll;
		}
		@@ -866,7 +876,9 @@ 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.
		@@ -881,7 +893,9 @@ 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;
		}

core/java/android/webkit/WebView.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -851,13 +851,17 @@ public class WebView extends AbsoluteLayout
		private PictureListener mPictureListener;
		/**
		* Interface to listen for new pictures as they change.
		* @deprecated This interface is now obsolete.
		*/
		@Deprecated
		public interface PictureListener {
		/**
		* Notify the listener that the picture has changed.
		* @param view The WebView that owns the picture.
		* @param picture The new picture.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public void onNewPicture(WebView view, Picture picture);
		}

		@@ -1500,7 +1504,9 @@ public class WebView extends AbsoluteLayout

		/**
		* Enables platform notifications of data state and proxy changes.
		* @deprecated Obsolete - platform notifications are always enabled.
		*/
		@Deprecated
		public static void enablePlatformNotifications() {
		Network.enablePlatformNotifications();
		}
		@@ -1508,7 +1514,9 @@ public class WebView extends AbsoluteLayout
		/**
		* If platform notifications are enabled, this should be called
		* from the Activity's onPause() or onStop().
		* @deprecated Obsolete - platform notifications are always enabled.
		*/
		@Deprecated
		public static void disablePlatformNotifications() {
		Network.disablePlatformNotifications();
		}
		@@ -1611,7 +1619,9 @@ public class WebView extends AbsoluteLayout
		* @param dest The file to store the serialized picture data. Will be
		* overwritten with this WebView's picture data.
		* @return True if the picture was successfully saved.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public boolean savePicture(Bundle b, final File dest) {
		if (dest == null \|\| b == null) {
		return false;
		@@ -1672,7 +1682,9 @@ public class WebView extends AbsoluteLayout
		* @param b A Bundle containing the saved display data.
		* @param src The file where the picture data was stored.
		* @return True if the picture was successfully restored.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public boolean restorePicture(Bundle b, File src) {
		if (src == null \|\| b == null) {
		return false;
		@@ -3609,7 +3621,9 @@ public class WebView extends AbsoluteLayout
		* Set the Picture listener. This is an interface used to receive
		* notifications of a new Picture.
		* @param listener An implementation of WebView.PictureListener.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public void setPictureListener(PictureListener listener) {
		mPictureListener = listener;
		}
		@@ -4965,7 +4979,9 @@ public class WebView extends AbsoluteLayout
		/**
		* Use this method to put the WebView into text selection mode.
		* Do not rely on this functionality; it will be deprecated in the future.
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public void emulateShiftHeld() {
		setUpSelect(false, 0, 0);
		}
		@@ -8236,6 +8252,10 @@ public class WebView extends AbsoluteLayout
		mWebViewCore.sendMessage(EventHub.SET_BACKGROUND_COLOR, color);
		}

		/**
		* @deprecated This method is now obsolete.
		*/
		@Deprecated
		public void debugDump() {
		nativeDebugDump();
		mWebViewCore.sendMessage(EventHub.DUMP_NAVTREE);