Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecating webkit API's that might not be supported in the future"

Browse Source
This commit is contained in:
Kristian Monsen
2011-05-10 10:57:52 -07:00
committed by Android (Google) Code Review
parent 5e4ab52859 fc77165d44
commit 39201b017f
4 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
api/current.txt
View File

@@ -22991,7 +22991,7 @@ package android.webkit {
public class WebHistoryItem implements java.lang.Cloneable {
method public android.graphics.Bitmap getFavicon();
method public int getId();
method public deprecated int getId();
method public java.lang.String getOriginalUrl();
method public java.lang.String getTitle();
method public java.lang.String getUrl();
@@ -23042,13 +23042,13 @@ package android.webkit {
method public synchronized java.lang.String getFixedFontFamily();
method public synchronized boolean getJavaScriptCanOpenWindowsAutomatically();
method public synchronized boolean getJavaScriptEnabled();
method public synchronized android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm();
method public deprecated synchronized android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm();
method public boolean getLightTouchEnabled();
method public boolean getLoadWithOverviewMode();
method public synchronized boolean getLoadsImagesAutomatically();
method public synchronized int getMinimumFontSize();
method public synchronized int getMinimumLogicalFontSize();
method public boolean getNavDump();
method public deprecated boolean getNavDump();
method public synchronized android.webkit.WebSettings.PluginState getPluginState();
method public deprecated synchronized boolean getPluginsEnabled();
method public deprecated synchronized java.lang.String getPluginsPath();
@@ -23059,7 +23059,7 @@ package android.webkit {
method public synchronized java.lang.String getStandardFontFamily();
method public synchronized android.webkit.WebSettings.TextSize getTextSize();
method public deprecated synchronized boolean getUseDoubleTree();
method public boolean getUseWebViewBackgroundForOverscrollBackground();
method public deprecated boolean getUseWebViewBackgroundForOverscrollBackground();
method public synchronized boolean getUseWideViewPort();
method public deprecated synchronized int getUserAgent();
method public synchronized java.lang.String getUserAgentString();
@@ -23088,13 +23088,13 @@ package android.webkit {
method public synchronized void setGeolocationEnabled(boolean);
method public synchronized void setJavaScriptCanOpenWindowsAutomatically(boolean);
method public synchronized void setJavaScriptEnabled(boolean);
method public synchronized void setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm);
method public deprecated synchronized void setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm);
method public void setLightTouchEnabled(boolean);
method public void setLoadWithOverviewMode(boolean);
method public synchronized void setLoadsImagesAutomatically(boolean);
method public synchronized void setMinimumFontSize(int);
method public synchronized void setMinimumLogicalFontSize(int);
method public void setNavDump(boolean);
method public deprecated void setNavDump(boolean);
method public void setNeedInitialFocus(boolean);
method public synchronized void setPluginState(android.webkit.WebSettings.PluginState);
method public deprecated synchronized void setPluginsEnabled(boolean);
@@ -23109,7 +23109,7 @@ package android.webkit {
method public void setSupportZoom(boolean);
method public synchronized void setTextSize(android.webkit.WebSettings.TextSize);
method public deprecated synchronized void setUseDoubleTree(boolean);
method public void setUseWebViewBackgroundForOverscrollBackground(boolean);
method public deprecated void setUseWebViewBackgroundForOverscrollBackground(boolean);
method public synchronized void setUseWideViewPort(boolean);
method public deprecated synchronized void setUserAgent(int);
method public synchronized void setUserAgentString(java.lang.String);
@@ -23122,7 +23122,7 @@ package android.webkit {
field public static final int LOAD_NO_CACHE = 2; // 0x2
}
public static final class WebSettings.LayoutAlgorithm extends java.lang.Enum {
public static final deprecated 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();
}
@@ -23200,12 +23200,12 @@ package android.webkit {
method public void clearSslPreferences();
method public void clearView();
method public android.webkit.WebBackForwardList copyBackForwardList();
method public void debugDump();
method public deprecated void debugDump();
method public void destroy();
method public static void disablePlatformNotifications();
method public static deprecated void disablePlatformNotifications();
method public void documentHasImages(android.os.Message);
method public void emulateShiftHeld();
method public static void enablePlatformNotifications();
method public deprecated void emulateShiftHeld();
method public static deprecated void enablePlatformNotifications();
method public static java.lang.String findAddress(java.lang.String);
method public int findAll(java.lang.String);
method public void findNext(boolean);
@@ -23248,11 +23248,11 @@ package android.webkit {
method public void removeJavascriptInterface(java.lang.String);
method public void requestFocusNodeHref(android.os.Message);
method public void requestImageRef(android.os.Message);
method public boolean restorePicture(android.os.Bundle, java.io.File);
method public deprecated boolean restorePicture(android.os.Bundle, java.io.File);
method public android.webkit.WebBackForwardList restoreState(android.os.Bundle);
method public void resumeTimers();
method public void savePassword(java.lang.String, java.lang.String, java.lang.String);
method public boolean savePicture(android.os.Bundle, java.io.File);
method public deprecated boolean savePicture(android.os.Bundle, java.io.File);
method public android.webkit.WebBackForwardList saveState(android.os.Bundle);
method public void saveWebArchive(java.lang.String);
method public void saveWebArchive(java.lang.String, boolean, android.webkit.ValueCallback<java.lang.String>);
@@ -23263,7 +23263,7 @@ package android.webkit {
method public void setInitialScale(int);
method public void setMapTrackballToArrowKeys(boolean);
method public void setNetworkAvailable(boolean);
method public void setPictureListener(android.webkit.WebView.PictureListener);
method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);
method public void setVerticalScrollbarOverlay(boolean);
method public void setWebChromeClient(android.webkit.WebChromeClient);
method public void setWebViewClient(android.webkit.WebViewClient);
@@ -23291,8 +23291,8 @@ package android.webkit {
field public static final int UNKNOWN_TYPE = 0; // 0x0
}
public static abstract interface WebView.PictureListener {
method public abstract void onNewPicture(android.webkit.WebView, android.graphics.Picture);
public static abstract deprecated interface WebView.PictureListener {
method public abstract deprecated void onNewPicture(android.webkit.WebView, android.graphics.Picture);
}
public class WebView.WebViewTransport {

2
core/java/android/webkit/WebHistoryItem.java
View File

@@ -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;
}

14
core/java/android/webkit/WebSettings.java
View File

@@ -42,8 +42,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,
@@ -520,14 +522,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;
}
@@ -665,7 +671,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;
}
@@ -673,7 +681,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;
}
@@ -876,7 +886,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.
@@ -891,7 +903,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;
}

22
core/java/android/webkit/WebView.java
View File

@@ -856,13 +856,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);
}
@@ -1547,7 +1551,10 @@ public class WebView extends AbsoluteLayout
/**
* Enables platform notifications of data state and proxy changes.
* Notifications are enabled by default.
*
* @deprecated This method is now obsolete.
*/
@Deprecated
public static void enablePlatformNotifications() {
checkThread();
synchronized (WebView.class) {
@@ -1562,7 +1569,10 @@ public class WebView extends AbsoluteLayout
/**
* Disables platform notifications of data state and proxy changes.
* Notifications are enabled by default.
*
* @deprecated This method is now obsolete.
*/
@Deprecated
public static void disablePlatformNotifications() {
checkThread();
synchronized (WebView.class) {
@@ -1676,7 +1686,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) {
checkThread();
if (dest == null || b == null) {
@@ -1739,7 +1751,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) {
checkThread();
if (src == null || b == null) {
@@ -3758,7 +3772,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) {
checkThread();
mPictureListener = listener;
@@ -5124,7 +5140,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() {
checkThread();
setUpSelect(false, 0, 0);
@@ -8827,6 +8845,10 @@ public class WebView extends AbsoluteLayout
mWebViewCore.sendMessage(EventHub.SET_BACKGROUND_COLOR, color);
}
/**
* @deprecated This method is now obsolete.
*/
@Deprecated
public void debugDump() {
checkThread();
nativeDebugDump();