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

Commit 82b6de03 authored by Kristian Monsen's avatar Kristian Monsen Committed by Android Git Automerger
Browse files

am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient... 

am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev

* commit '03499a23':
  Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
parents a583a5ac 03499a23

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -27638,7 +27638,7 @@ package android.webkit { 
    method public void onReceivedTouchIconUrl(android.webkit.WebView, java.lang.String, boolean);

    method public void onRequestFocus(android.webkit.WebView);

    method public void onShowCustomView(android.view.View, android.webkit.WebChromeClient.CustomViewCallback);

    method public void onShowCustomView(android.view.View, int, android.webkit.WebChromeClient.CustomViewCallback);

    method public deprecated void onShowCustomView(android.view.View, int, android.webkit.WebChromeClient.CustomViewCallback);

  }















  public static abstract interface WebChromeClient.CustomViewCallback {

























core/java/android/webkit/WebChromeClient.java



+6
−1




























Original line number
Diff line number
Diff line








@@ -69,7 +69,9 @@ public class WebChromeClient {





























    /**















     * Notify the host application that the current page would













     * like to show a custom View.













     * like to show a custom View.  This is used for Fullscreen













     * video playback; see "HTML5 Video support" documentation on













     * {@link WebView}.















     * @param view is the View object to be shown.















     * @param callback is the callback to be invoked if and when the view















     * is dismissed.









@@ -84,7 +86,10 @@ public class WebChromeClient {













     * {@link ActivityInfo#screenOrientation ActivityInfo.screenOrientation}.















     * @param callback is the callback to be invoked if and when the view















     * is dismissed.













     * @deprecated This method supports the obsolete plugin mechanism,













     * and will not be invoked in future















     */













    @Deprecated















    public void onShowCustomView(View view, int requestedOrientation,















            CustomViewCallback callback) {};