Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8694a08 authored by Paul Miller's avatar Paul Miller
Browse files

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
parent 6c72febd

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -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);

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -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);

core/java/android/webkit/WebView.java

+14 −10
Original line number Diff line number Diff line
@@ -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;

    }



    /**

core/java/android/webkit/WebViewProvider.java

+4 −0
Original line number Diff line number Diff line
@@ -70,12 +70,16 @@ public interface WebViewProvider { 
    public void init(Map<String, Object> 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();