Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1

Browse Source 
* commit '277cbe5a951840558166020568fb1510285e2594':
  set System UI visibility based on MediaController state
This commit is contained in:
Michael Kolb
2011-12-05 09:26:21 -08:00
committed by Android Git Automerger
parent a91e54fed6 277cbe5a95
commit 32e914fc03
1 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/java/android/webkit/HTML5VideoFullScreen.java
View File

@@ -4,15 +4,12 @@ package android.webkit;
import android.content.Context; import android.content.Context;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.media.Metadata; import android.media.Metadata;
import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.webkit.HTML5VideoView;
import android.webkit.HTML5VideoViewProxy;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.MediaController; import android.widget.MediaController;
import android.widget.MediaController.MediaPlayerControl; import android.widget.MediaController.MediaPlayerControl;
@@ -150,7 +147,7 @@ public class HTML5VideoFullScreen extends HTML5VideoView
private void prepareForFullScreen() { private void prepareForFullScreen() {
// So in full screen, we reset the MediaPlayer // So in full screen, we reset the MediaPlayer
mPlayer.reset(); mPlayer.reset();
MediaController mc = new MediaController(mProxy.getContext()); MediaController mc = new FullScreenMediaController(mProxy.getContext(), mLayout);
mc.setSystemUiVisibility(mLayout.getSystemUiVisibility()); mc.setSystemUiVisibility(mLayout.getSystemUiVisibility());
setMediaController(mc); setMediaController(mc);
mPlayer.setScreenOnWhilePlaying(true); mPlayer.setScreenOnWhilePlaying(true);
@@ -261,9 +258,6 @@ public class HTML5VideoFullScreen extends HTML5VideoView
mLayout.addView(getSurfaceView(), layoutParams); mLayout.addView(getSurfaceView(), layoutParams);
mLayout.setVisibility(View.VISIBLE); mLayout.setVisibility(View.VISIBLE);
mLayout.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
WebChromeClient client = webView.getWebChromeClient(); WebChromeClient client = webView.getWebChromeClient();
if (client != null) { if (client != null) {
client.onShowCustomView(mLayout, mCallback); client.onShowCustomView(mLayout, mCallback);
@@ -340,4 +334,33 @@ public class HTML5VideoFullScreen extends HTML5VideoView
} }
return; return;
} }
static class FullScreenMediaController extends MediaController {
View mVideoView;
public FullScreenMediaController(Context context, View video) {
super(context);
mVideoView = video;
}
@Override
public void show() {
super.show();
if (mVideoView != null) {
mVideoView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
}
}
@Override
public void hide() {
if (mVideoView != null) {
mVideoView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
}
super.hide();
}
}
} }