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

Commit b145112e authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by Android (Google) Code Review
Browse files

Merge "Correctly detect when switching back from full screen"

parents aef1987f 1a88acbe

core/java/android/webkit/HTML5VideoFullScreen.java

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ public class HTML5VideoFullScreen extends HTML5VideoView 
        mVideoSurfaceView.getHolder().setFixedSize(mVideoWidth, mVideoHeight);

    }



    public boolean fullScreenExited() {

        return (mLayout == null);

    }



    private final WebChromeClient.CustomViewCallback mCallback =

        new WebChromeClient.CustomViewCallback() {

core/java/android/webkit/HTML5VideoView.java

+5 −0
Original line number Diff line number Diff line
@@ -320,4 +320,9 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener { 
        return false;

    }



    public boolean fullScreenExited() {

        // Only meaningful for HTML5VideoFullScreen

        return false;

    }



}

core/java/android/webkit/HTML5VideoViewProxy.java

+1 −3
Original line number Diff line number Diff line
@@ -173,9 +173,7 @@ class HTML5VideoViewProxy extends Handler 
            boolean backFromFullScreenMode = false;

            if (mHTML5VideoView != null) {

                currentVideoLayerId = mHTML5VideoView.getVideoLayerId();

                if (mHTML5VideoView instanceof HTML5VideoFullScreen) {

                    backFromFullScreenMode = true;

                }

                backFromFullScreenMode = mHTML5VideoView.fullScreenExited();

            }



            if (backFromFullScreenMode