From c8694a082ab4870d9f148ac98a5e1b3b07d75cc0 Mon Sep 17 00:00:00 2001 From: Paul Miller Date: Fri, 5 Jun 2015 11:23:03 -0700 Subject: [PATCH] Deprecate WebView scrollbar overlay API Deprecate setHorizontalScrollbarOverlay, setVerticalScrollbarOverlay, overlayHorizontalScrollbar, and overlayVerticalScrollbar. They've been no-ops for years, ever since WebViewChromium. BUG:21642246 Change-Id: Ia1062c53fdbaa7a0d282ba79da733a6f3b9ac84f --- api/current.txt | 8 +++---- api/system-current.txt | 8 +++---- core/java/android/webkit/WebView.java | 24 +++++++++++-------- core/java/android/webkit/WebViewProvider.java | 4 ++++ 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/api/current.txt b/api/current.txt index c105345512482..7a75da425c30e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39211,8 +39211,8 @@ package android.webkit { method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View); method public void onPause(); method public void onResume(); - method public boolean overlayHorizontalScrollbar(); - method public boolean overlayVerticalScrollbar(); + method public deprecated boolean overlayHorizontalScrollbar(); + method public deprecated boolean overlayVerticalScrollbar(); method public boolean pageDown(boolean); method public boolean pageUp(boolean); method public void pauseTimers(); @@ -39232,13 +39232,13 @@ package android.webkit { method public deprecated void setCertificate(android.net.http.SslCertificate); method public void setDownloadListener(android.webkit.DownloadListener); method public void setFindListener(android.webkit.WebView.FindListener); - method public void setHorizontalScrollbarOverlay(boolean); + method public deprecated void setHorizontalScrollbarOverlay(boolean); method public void setHttpAuthUsernamePassword(java.lang.String, java.lang.String, java.lang.String, java.lang.String); method public void setInitialScale(int); method public deprecated void setMapTrackballToArrowKeys(boolean); method public void setNetworkAvailable(boolean); method public deprecated void setPictureListener(android.webkit.WebView.PictureListener); - method public void setVerticalScrollbarOverlay(boolean); + method public deprecated void setVerticalScrollbarOverlay(boolean); method public void setWebChromeClient(android.webkit.WebChromeClient); method public static void setWebContentsDebuggingEnabled(boolean); method public void setWebViewClient(android.webkit.WebViewClient); diff --git a/api/system-current.txt b/api/system-current.txt index 14c9939c63abc..00019b8e5f375 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -41555,8 +41555,8 @@ package android.webkit { method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View); method public void onPause(); method public void onResume(); - method public boolean overlayHorizontalScrollbar(); - method public boolean overlayVerticalScrollbar(); + method public deprecated boolean overlayHorizontalScrollbar(); + method public deprecated boolean overlayVerticalScrollbar(); method public boolean pageDown(boolean); method public boolean pageUp(boolean); method public void pauseTimers(); @@ -41576,13 +41576,13 @@ package android.webkit { method public deprecated void setCertificate(android.net.http.SslCertificate); method public void setDownloadListener(android.webkit.DownloadListener); method public void setFindListener(android.webkit.WebView.FindListener); - method public void setHorizontalScrollbarOverlay(boolean); + method public deprecated void setHorizontalScrollbarOverlay(boolean); method public void setHttpAuthUsernamePassword(java.lang.String, java.lang.String, java.lang.String, java.lang.String); method public void setInitialScale(int); method public deprecated void setMapTrackballToArrowKeys(boolean); method public void setNetworkAvailable(boolean); method public deprecated void setPictureListener(android.webkit.WebView.PictureListener); - method public void setVerticalScrollbarOverlay(boolean); + method public deprecated void setVerticalScrollbarOverlay(boolean); method public void setWebChromeClient(android.webkit.WebChromeClient); method public static void setWebContentsDebuggingEnabled(boolean); method public void setWebViewClient(android.webkit.WebViewClient); diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 5080fccbf00d6..aa72eb3cf2dd6 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -611,41 +611,45 @@ public class WebView extends AbsoluteLayout /** * Specifies whether the horizontal scrollbar has overlay style. * + * @deprecated This method has no effect. * @param overlay true if horizontal scrollbar should have overlay style */ + @Deprecated public void setHorizontalScrollbarOverlay(boolean overlay) { - checkThread(); - mProvider.setHorizontalScrollbarOverlay(overlay); } /** * Specifies whether the vertical scrollbar has overlay style. * + * @deprecated This method has no effect. * @param overlay true if vertical scrollbar should have overlay style */ + @Deprecated public void setVerticalScrollbarOverlay(boolean overlay) { - checkThread(); - mProvider.setVerticalScrollbarOverlay(overlay); } /** * Gets whether horizontal scrollbar has overlay style. * - * @return true if horizontal scrollbar has overlay style + * @deprecated This method is now obsolete. + * @return true */ + @Deprecated public boolean overlayHorizontalScrollbar() { - checkThread(); - return mProvider.overlayHorizontalScrollbar(); + // The old implementation defaulted to true, so return true for consistency + return true; } /** * Gets whether vertical scrollbar has overlay style. * - * @return true if vertical scrollbar has overlay style + * @deprecated This method is now obsolete. + * @return false */ + @Deprecated public boolean overlayVerticalScrollbar() { - checkThread(); - return mProvider.overlayVerticalScrollbar(); + // The old implementation defaulted to false, so return false for consistency + return false; } /** diff --git a/core/java/android/webkit/WebViewProvider.java b/core/java/android/webkit/WebViewProvider.java index 09afcf1222c5f..27033ad611861 100644 --- a/core/java/android/webkit/WebViewProvider.java +++ b/core/java/android/webkit/WebViewProvider.java @@ -70,12 +70,16 @@ public interface WebViewProvider { public void init(Map javaScriptInterfaces, boolean privateBrowsing); + // Deprecated - should never be called public void setHorizontalScrollbarOverlay(boolean overlay); + // Deprecated - should never be called public void setVerticalScrollbarOverlay(boolean overlay); + // Deprecated - should never be called public boolean overlayHorizontalScrollbar(); + // Deprecated - should never be called public boolean overlayVerticalScrollbar(); public int getVisibleTitleHeight();