Skip to content

Commit 4cb846b

Browse files
kristianmonsenAndroid (Google) Code Review
kristianmonsen
authored and
Android (Google) Code Review
committed
Merge "Hiding some of the deprecated android.webkit API's" into jb-mr1-dev
2 parents 51fbaff + f491258 commit 4cb846b

7 files changed

Lines changed: 29 additions & 112 deletions

File tree

‎api/17.txt‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -26107,35 +26107,6 @@ package android.view.textservice {
2610726107

2610826108
package android.webkit {
2610926109

26110-
public final deprecated class CacheManager {
26111-
ctor public CacheManager();
26112-
method public static deprecated boolean cacheDisabled();
26113-
method public static deprecated boolean endCacheTransaction();
26114-
method public static deprecated android.webkit.CacheManager.CacheResult getCacheFile(java.lang.String, java.util.Map<java.lang.String, java.lang.String>);
26115-
method public static deprecated java.io.File getCacheFileBaseDir();
26116-
method public static deprecated void saveCacheFile(java.lang.String, android.webkit.CacheManager.CacheResult);
26117-
method public static deprecated boolean startCacheTransaction();
26118-
}
26119-
26120-
public static deprecated class CacheManager.CacheResult {
26121-
ctor public CacheManager.CacheResult();
26122-
method public java.lang.String getContentDisposition();
26123-
method public long getContentLength();
26124-
method public java.lang.String getETag();
26125-
method public java.lang.String getEncoding();
26126-
method public long getExpires();
26127-
method public java.lang.String getExpiresString();
26128-
method public int getHttpStatusCode();
26129-
method public java.io.InputStream getInputStream();
26130-
method public java.lang.String getLastModified();
26131-
method public java.lang.String getLocalPath();
26132-
method public java.lang.String getLocation();
26133-
method public java.lang.String getMimeType();
26134-
method public java.io.OutputStream getOutputStream();
26135-
method public void setEncoding(java.lang.String);
26136-
method public void setInputStream(java.io.InputStream);
26137-
}
26138-
2613926110
public class ConsoleMessage {
2614026111
ctor public ConsoleMessage(java.lang.String, java.lang.String, int, android.webkit.ConsoleMessage.MessageLevel);
2614126112
method public int lineNumber();
@@ -26298,7 +26269,6 @@ package android.webkit {
2629826269

2629926270
public class WebHistoryItem implements java.lang.Cloneable {
2630026271
method public android.graphics.Bitmap getFavicon();
26301-
method public deprecated int getId();
2630226272
method public java.lang.String getOriginalUrl();
2630326273
method public java.lang.String getTitle();
2630426274
method public java.lang.String getUrl();
@@ -26357,7 +26327,6 @@ package android.webkit {
2635726327
method public synchronized boolean getLoadsImagesAutomatically();
2635826328
method public synchronized int getMinimumFontSize();
2635926329
method public synchronized int getMinimumLogicalFontSize();
26360-
method public deprecated boolean getNavDump();
2636126330
method public synchronized android.webkit.WebSettings.PluginState getPluginState();
2636226331
method public deprecated synchronized boolean getPluginsEnabled();
2636326332
method public deprecated synchronized java.lang.String getPluginsPath();
@@ -26368,10 +26337,7 @@ package android.webkit {
2636826337
method public synchronized java.lang.String getStandardFontFamily();
2636926338
method public deprecated synchronized android.webkit.WebSettings.TextSize getTextSize();
2637026339
method public synchronized int getTextZoom();
26371-
method public deprecated synchronized boolean getUseDoubleTree();
26372-
method public deprecated boolean getUseWebViewBackgroundForOverscrollBackground();
2637326340
method public synchronized boolean getUseWideViewPort();
26374-
method public deprecated synchronized int getUserAgent();
2637526341
method public synchronized java.lang.String getUserAgentString();
2637626342
method public void setAllowContentAccess(boolean);
2637726343
method public void setAllowFileAccess(boolean);
@@ -26406,7 +26372,6 @@ package android.webkit {
2640626372
method public synchronized void setLoadsImagesAutomatically(boolean);
2640726373
method public synchronized void setMinimumFontSize(int);
2640826374
method public synchronized void setMinimumLogicalFontSize(int);
26409-
method public deprecated void setNavDump(boolean);
2641026375
method public void setNeedInitialFocus(boolean);
2641126376
method public synchronized void setPluginState(android.webkit.WebSettings.PluginState);
2641226377
method public deprecated synchronized void setPluginsEnabled(boolean);
@@ -26421,10 +26386,7 @@ package android.webkit {
2642126386
method public void setSupportZoom(boolean);
2642226387
method public deprecated synchronized void setTextSize(android.webkit.WebSettings.TextSize);
2642326388
method public synchronized void setTextZoom(int);
26424-
method public deprecated synchronized void setUseDoubleTree(boolean);
26425-
method public deprecated void setUseWebViewBackgroundForOverscrollBackground(boolean);
2642626389
method public synchronized void setUseWideViewPort(boolean);
26427-
method public deprecated synchronized void setUserAgent(int);
2642826390
method public synchronized void setUserAgentString(java.lang.String);
2642926391
method public synchronized boolean supportMultipleWindows();
2643026392
method public boolean supportZoom();
@@ -26529,12 +26491,8 @@ package android.webkit {
2652926491
method public void clearSslPreferences();
2653026492
method public void clearView();
2653126493
method public android.webkit.WebBackForwardList copyBackForwardList();
26532-
method public deprecated void debugDump();
2653326494
method public void destroy();
26534-
method public static deprecated void disablePlatformNotifications();
2653526495
method public void documentHasImages(android.os.Message);
26536-
method public deprecated void emulateShiftHeld();
26537-
method public static deprecated void enablePlatformNotifications();
2653826496
method public static java.lang.String findAddress(java.lang.String);
2653926497
method public deprecated int findAll(java.lang.String);
2654026498
method public void findAllAsync(java.lang.String);
@@ -26552,7 +26510,6 @@ package android.webkit {
2655226510
method public android.webkit.WebSettings getSettings();
2655326511
method public java.lang.String getTitle();
2655426512
method public java.lang.String getUrl();
26555-
method public deprecated int getVisibleTitleHeight();
2655626513
method public void goBack();
2655726514
method public void goBackOrForward(int);
2655826515
method public void goForward();
@@ -26577,11 +26534,9 @@ package android.webkit {
2657726534
method public void removeJavascriptInterface(java.lang.String);
2657826535
method public void requestFocusNodeHref(android.os.Message);
2657926536
method public void requestImageRef(android.os.Message);
26580-
method public deprecated boolean restorePicture(android.os.Bundle, java.io.File);
2658126537
method public android.webkit.WebBackForwardList restoreState(android.os.Bundle);
2658226538
method public void resumeTimers();
2658326539
method public void savePassword(java.lang.String, java.lang.String, java.lang.String);
26584-
method public deprecated boolean savePicture(android.os.Bundle, java.io.File);
2658526540
method public android.webkit.WebBackForwardList saveState(android.os.Bundle);
2658626541
method public void saveWebArchive(java.lang.String);
2658726542
method public void saveWebArchive(java.lang.String, boolean, android.webkit.ValueCallback<java.lang.String>);
@@ -26593,7 +26548,6 @@ package android.webkit {
2659326548
method public void setInitialScale(int);
2659426549
method public void setMapTrackballToArrowKeys(boolean);
2659526550
method public void setNetworkAvailable(boolean);
26596-
method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);
2659726551
method public void setVerticalScrollbarOverlay(boolean);
2659826552
method public void setWebChromeClient(android.webkit.WebChromeClient);
2659926553
method public void setWebViewClient(android.webkit.WebViewClient);
@@ -26677,7 +26631,6 @@ package android.webkit {
2667726631
method public boolean hasFormData();
2667826632
method public boolean hasHttpAuthUsernamePassword();
2667926633
method public boolean hasUsernamePassword();
26680-
field protected static final java.lang.String LOGTAG = "webviewdatabase";
2668126634
}
2668226635

2668326636
public class WebViewFragment extends android.app.Fragment {

‎api/current.txt‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -26922,35 +26922,6 @@ package android.view.textservice {
2692226922

2692326923
package android.webkit {
2692426924

26925-
public final deprecated class CacheManager {
26926-
ctor public CacheManager();
26927-
method public static deprecated boolean cacheDisabled();
26928-
method public static deprecated boolean endCacheTransaction();
26929-
method public static deprecated android.webkit.CacheManager.CacheResult getCacheFile(java.lang.String, java.util.Map<java.lang.String, java.lang.String>);
26930-
method public static deprecated java.io.File getCacheFileBaseDir();
26931-
method public static deprecated void saveCacheFile(java.lang.String, android.webkit.CacheManager.CacheResult);
26932-
method public static deprecated boolean startCacheTransaction();
26933-
}
26934-
26935-
public static deprecated class CacheManager.CacheResult {
26936-
ctor public CacheManager.CacheResult();
26937-
method public java.lang.String getContentDisposition();
26938-
method public long getContentLength();
26939-
method public java.lang.String getETag();
26940-
method public java.lang.String getEncoding();
26941-
method public long getExpires();
26942-
method public java.lang.String getExpiresString();
26943-
method public int getHttpStatusCode();
26944-
method public java.io.InputStream getInputStream();
26945-
method public java.lang.String getLastModified();
26946-
method public java.lang.String getLocalPath();
26947-
method public java.lang.String getLocation();
26948-
method public java.lang.String getMimeType();
26949-
method public java.io.OutputStream getOutputStream();
26950-
method public void setEncoding(java.lang.String);
26951-
method public void setInputStream(java.io.InputStream);
26952-
}
26953-
2695426925
public class ConsoleMessage {
2695526926
ctor public ConsoleMessage(java.lang.String, java.lang.String, int, android.webkit.ConsoleMessage.MessageLevel);
2695626927
method public int lineNumber();
@@ -27116,7 +27087,6 @@ package android.webkit {
2711627087

2711727088
public class WebHistoryItem implements java.lang.Cloneable {
2711827089
method public android.graphics.Bitmap getFavicon();
27119-
method public deprecated int getId();
2712027090
method public java.lang.String getOriginalUrl();
2712127091
method public java.lang.String getTitle();
2712227092
method public java.lang.String getUrl();
@@ -27177,7 +27147,6 @@ package android.webkit {
2717727147
method public boolean getMediaPlaybackRequiresUserGesture();
2717827148
method public synchronized int getMinimumFontSize();
2717927149
method public synchronized int getMinimumLogicalFontSize();
27180-
method public deprecated boolean getNavDump();
2718127150
method public synchronized android.webkit.WebSettings.PluginState getPluginState();
2718227151
method public deprecated synchronized boolean getPluginsEnabled();
2718327152
method public deprecated synchronized java.lang.String getPluginsPath();
@@ -27188,10 +27157,7 @@ package android.webkit {
2718827157
method public synchronized java.lang.String getStandardFontFamily();
2718927158
method public deprecated synchronized android.webkit.WebSettings.TextSize getTextSize();
2719027159
method public synchronized int getTextZoom();
27191-
method public deprecated synchronized boolean getUseDoubleTree();
27192-
method public deprecated boolean getUseWebViewBackgroundForOverscrollBackground();
2719327160
method public synchronized boolean getUseWideViewPort();
27194-
method public deprecated synchronized int getUserAgent();
2719527161
method public synchronized java.lang.String getUserAgentString();
2719627162
method public void setAllowContentAccess(boolean);
2719727163
method public void setAllowFileAccess(boolean);
@@ -27227,7 +27193,6 @@ package android.webkit {
2722727193
method public void setMediaPlaybackRequiresUserGesture(boolean);
2722827194
method public synchronized void setMinimumFontSize(int);
2722927195
method public synchronized void setMinimumLogicalFontSize(int);
27230-
method public deprecated void setNavDump(boolean);
2723127196
method public void setNeedInitialFocus(boolean);
2723227197
method public synchronized void setPluginState(android.webkit.WebSettings.PluginState);
2723327198
method public deprecated synchronized void setPluginsEnabled(boolean);
@@ -27242,10 +27207,8 @@ package android.webkit {
2724227207
method public void setSupportZoom(boolean);
2724327208
method public deprecated synchronized void setTextSize(android.webkit.WebSettings.TextSize);
2724427209
method public synchronized void setTextZoom(int);
27245-
method public deprecated synchronized void setUseDoubleTree(boolean);
2724627210
method public deprecated void setUseWebViewBackgroundForOverscrollBackground(boolean);
2724727211
method public synchronized void setUseWideViewPort(boolean);
27248-
method public deprecated synchronized void setUserAgent(int);
2724927212
method public synchronized void setUserAgentString(java.lang.String);
2725027213
method public synchronized boolean supportMultipleWindows();
2725127214
method public boolean supportZoom();
@@ -27350,12 +27313,8 @@ package android.webkit {
2735027313
method public void clearSslPreferences();
2735127314
method public void clearView();
2735227315
method public android.webkit.WebBackForwardList copyBackForwardList();
27353-
method public deprecated void debugDump();
2735427316
method public void destroy();
27355-
method public static deprecated void disablePlatformNotifications();
2735627317
method public void documentHasImages(android.os.Message);
27357-
method public deprecated void emulateShiftHeld();
27358-
method public static deprecated void enablePlatformNotifications();
2735927318
method public static java.lang.String findAddress(java.lang.String);
2736027319
method public deprecated int findAll(java.lang.String);
2736127320
method public void findAllAsync(java.lang.String);
@@ -27373,7 +27332,6 @@ package android.webkit {
2737327332
method public android.webkit.WebSettings getSettings();
2737427333
method public java.lang.String getTitle();
2737527334
method public java.lang.String getUrl();
27376-
method public deprecated int getVisibleTitleHeight();
2737727335
method public void goBack();
2737827336
method public void goBackOrForward(int);
2737927337
method public void goForward();
@@ -27398,11 +27356,9 @@ package android.webkit {
2739827356
method public void removeJavascriptInterface(java.lang.String);
2739927357
method public void requestFocusNodeHref(android.os.Message);
2740027358
method public void requestImageRef(android.os.Message);
27401-
method public deprecated boolean restorePicture(android.os.Bundle, java.io.File);
2740227359
method public android.webkit.WebBackForwardList restoreState(android.os.Bundle);
2740327360
method public void resumeTimers();
2740427361
method public void savePassword(java.lang.String, java.lang.String, java.lang.String);
27405-
method public deprecated boolean savePicture(android.os.Bundle, java.io.File);
2740627362
method public android.webkit.WebBackForwardList saveState(android.os.Bundle);
2740727363
method public void saveWebArchive(java.lang.String);
2740827364
method public void saveWebArchive(java.lang.String, boolean, android.webkit.ValueCallback<java.lang.String>);
@@ -27414,7 +27370,6 @@ package android.webkit {
2741427370
method public void setInitialScale(int);
2741527371
method public deprecated void setMapTrackballToArrowKeys(boolean);
2741627372
method public void setNetworkAvailable(boolean);
27417-
method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);
2741827373
method public void setVerticalScrollbarOverlay(boolean);
2741927374
method public void setWebChromeClient(android.webkit.WebChromeClient);
2742027375
method public void setWebViewClient(android.webkit.WebViewClient);
@@ -27498,7 +27453,6 @@ package android.webkit {
2749827453
method public boolean hasFormData();
2749927454
method public boolean hasHttpAuthUsernamePassword();
2750027455
method public boolean hasUsernamePassword();
27501-
field protected static final java.lang.String LOGTAG = "webviewdatabase";
2750227456
}
2750327457

2750427458
public class WebViewFragment extends android.app.Fragment {

‎core/java/android/webkit/CacheManager.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
/**
3333
* Manages the HTTP cache used by an application's {@link WebView} instances.
3434
* @deprecated Access to the HTTP cache will be removed in a future release.
35+
* @hide Since {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
3536
*/
3637
// The class CacheManager provides the persistent cache of content that is
3738
// received over the network. The component handles parsing of HTTP headers and

‎core/java/android/webkit/WebHistoryItem.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public WebHistoryItem() {
3838
* same object.
3939
* @return The id for this item.
4040
* @deprecated This method is now obsolete.
41+
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
4142
*/
4243
@Deprecated
4344
public int getId() {

‎core/java/android/webkit/WebSettings.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ protected WebSettings() {
164164
* is false.
165165
*
166166
* @deprecated This method is now obsolete.
167+
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
167168
*/
168169
@Deprecated
169170
public void setNavDump(boolean enabled) {
@@ -176,6 +177,7 @@ public void setNavDump(boolean enabled) {
176177
* @return whether dumping the navigation cache is enabled
177178
* @see #setNavDump
178179
* @deprecated This method is now obsolete.
180+
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
179181
*/
180182
@Deprecated
181183
public boolean getNavDump() {
@@ -377,6 +379,7 @@ public void setUseWebViewBackgroundForOverscrollBackground(boolean view) {
377379
*
378380
* @see #setUseWebViewBackgroundForOverscrollBackground
379381
* @deprecated This method is now obsolete.
382+
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
380383
*/
381384
@Deprecated
382385
public boolean getUseWebViewBackgroundForOverscrollBackground() {
@@ -518,6 +521,7 @@ public boolean getLightTouchEnabled() {
518521
* it now has no effect.
519522
*
520523
* @deprecated This setting now has no effect.
524+
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
521525
*/
522526
@Deprecated
523527
public synchronized void setUseDoubleTree(boolean use) {
@@ -529,6 +533,7 @@ public synchronized void setUseDoubleTree(boolean use) {
529533
* it now has no effect.
530534
*
531535
* @deprecated This setting now has no effect.
536+
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
532537
*/
533538
@Deprecated
534539
public synchronized boolean getUseDoubleTree() {
@@ -547,6 +552,7 @@ public synchronized boolean getUseDoubleTree() {
547552
*
548553
* @param ua the integer code for the user-agent string
549554
* @deprecated Please use {@link #setUserAgentString} instead.
555+
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
550556
*/
551557
@Deprecated
552558
public synchronized void setUserAgent(int ua) {
@@ -565,6 +571,7 @@ public synchronized void setUserAgent(int ua) {
565571
* @return the integer code for the user-agent string
566572
* @see #setUserAgent
567573
* @deprecated Please use {@link #getUserAgentString} instead.
574+
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
568575
*/
569576
@Deprecated
570577
public synchronized int getUserAgent() {
@@ -1251,8 +1258,7 @@ public synchronized String getUserAgentString() {
12511258
/**
12521259
* Returns the default User-Agent used by a WebView.
12531260
* An instance of WebView could use a different User-Agent if a call
1254-
* is made to {@link WebSettings#setUserAgent(int)} or
1255-
* {@link WebSettings#setUserAgentString(String)}.
1261+
* is made to {@link WebSettings#setUserAgentString(String)}.
12561262
*
12571263
* @param context a Context object used to access application assets
12581264
*/

0 commit comments

Comments
 (0)