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

Commit ad64a12b authored by Nate Fischer's avatar Nate Fischer Committed by Android (Google) Code Review
Browse files

Merge "Add APIs to get WebViewClient and WebChromeClient"

parents df2aa871 6e585844

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -45846,6 +45846,8 @@ package android.webkit { 
    method public android.webkit.WebSettings getSettings();

    method public java.lang.String getTitle();

    method public java.lang.String getUrl();

    method public android.webkit.WebChromeClient getWebChromeClient();

    method public android.webkit.WebViewClient getWebViewClient();

    method public void goBack();

    method public void goBackOrForward(int);

    method public void goForward();

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -49122,6 +49122,8 @@ package android.webkit { 
    method public android.webkit.WebSettings getSettings();

    method public java.lang.String getTitle();

    method public java.lang.String getUrl();

    method public android.webkit.WebChromeClient getWebChromeClient();

    method public android.webkit.WebViewClient getWebViewClient();

    method public android.webkit.WebViewProvider getWebViewProvider();

    method public void goBack();

    method public void goBackOrForward(int);
@@ -49402,6 +49404,8 @@ package android.webkit { 
    method public abstract java.lang.String getUrl();

    method public abstract android.webkit.WebViewProvider.ViewDelegate getViewDelegate();

    method public abstract int getVisibleTitleHeight();

    method public abstract android.webkit.WebChromeClient getWebChromeClient();

    method public abstract android.webkit.WebViewClient getWebViewClient();

    method public abstract android.view.View getZoomControls();

    method public abstract void goBack();

    method public abstract void goBackOrForward(int);

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -45934,6 +45934,8 @@ package android.webkit { 
    method public android.webkit.WebSettings getSettings();

    method public java.lang.String getTitle();

    method public java.lang.String getUrl();

    method public android.webkit.WebChromeClient getWebChromeClient();

    method public android.webkit.WebViewClient getWebViewClient();

    method public void goBack();

    method public void goBackOrForward(int);

    method public void goForward();

core/java/android/webkit/WebView.java

+24 −0
Original line number Diff line number Diff line
@@ -1768,12 +1768,24 @@ public class WebView extends AbsoluteLayout 
     * requests. This will replace the current handler.

     *

     * @param client an implementation of WebViewClient

     * @see #getWebViewClient

     */

    public void setWebViewClient(WebViewClient client) {

        checkThread();

        mProvider.setWebViewClient(client);

    }



    /**

     * Gets the WebViewClient.

     *

     * @return the WebViewClient, or a default client if not yet set

     * @see #setWebViewClient

     */

    public WebViewClient getWebViewClient() {

        checkThread();

        return mProvider.getWebViewClient();

    }



    /**

     * Registers the interface to be used when content can not be handled by

     * the rendering engine, and should be downloaded instead. This will replace
@@ -1792,12 +1804,24 @@ public class WebView extends AbsoluteLayout 
     * This will replace the current handler.

     *

     * @param client an implementation of WebChromeClient

     * @see #getWebChromeClient

     */

    public void setWebChromeClient(WebChromeClient client) {

        checkThread();

        mProvider.setWebChromeClient(client);

    }



    /**

     * Gets the chrome handler.

     *

     * @return the WebChromeClient, or null if not yet set

     * @see #setWebChromeClient

     */

    public WebChromeClient getWebChromeClient() {

        checkThread();

        return mProvider.getWebChromeClient();

    }



    /**

     * Sets the Picture listener. This is an interface used to receive

     * notifications of a new Picture.

core/java/android/webkit/WebViewProvider.java

+4 −0
Original line number Diff line number Diff line
@@ -229,10 +229,14 @@ public interface WebViewProvider { 


    public void setWebViewClient(WebViewClient client);



    public WebViewClient getWebViewClient();



    public void setDownloadListener(DownloadListener listener);



    public void setWebChromeClient(WebChromeClient client);



    public WebChromeClient getWebChromeClient();



    public void setPictureListener(PictureListener listener);



    public void addJavascriptInterface(Object obj, String interfaceName);