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

Commit 207b5e17 authored by Jonathan Dixon's avatar Jonathan Dixon Committed by Android Git Automerger
Browse files

am 402099f7: Merge "Unhide setPictureListener" into jb-mr1-dev 

* commit '402099f7':
  Unhide setPictureListener
parents a58800d1 402099f7

api/17.txt

+1 −0
Original line number Diff line number Diff line
@@ -27448,6 +27448,7 @@ package android.webkit { 
    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 void setWebChromeClient(android.webkit.WebChromeClient);

    method public void setWebViewClient(android.webkit.WebViewClient);

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -27467,6 +27467,7 @@ package android.webkit { 
    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 void setWebChromeClient(android.webkit.WebChromeClient);

    method public void setWebViewClient(android.webkit.WebViewClient);

core/java/android/webkit/WebView.java

+0 −1
Original line number Diff line number Diff line
@@ -1480,7 +1480,6 @@ public class WebView extends AbsoluteLayout 
     *

     * @param listener an implementation of WebView.PictureListener

     * @deprecated This method is now obsolete.

     * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}

     */

    @Deprecated

    public void setPictureListener(PictureListener listener) {