drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "HTML5 Video improvements" into honeycomb-mr1

Browse Source
This commit is contained in:
Nicolas Roard
2011-03-11 14:35:32 -08:00
committed by Android (Google) Code Review
parent 14c875eac7 0e778a1ab0
commit f0230cca19
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/webkit/WebView.java
View File

@ -671,6 +671,7 @@ public class WebView extends AbsoluteLayout
static final int SELECT_AT = 135;
static final int SCREEN_ON = 136;
static final int ENTER_FULLSCREEN_VIDEO = 137;
private static final int FIRST_PACKAGE_MSG_ID = SCROLL_TO_MSG_ID;
private static final int LAST_PACKAGE_MSG_ID = SET_TOUCH_HIGHLIGHT_RECTS;
@ -725,7 +726,8 @@ public class WebView extends AbsoluteLayout
"SET_AUTOFILLABLE", // = 133;
"AUTOFILL_COMPLETE", // = 134;
"SELECT_AT", // = 135;
"SCREEN_ON" // = 136;
"SCREEN_ON", // = 136;
"ENTER_FULLSCREEN_VIDEO" // = 137;
};
// If the site doesn't use the viewport meta tag to specify the viewport,
@ -7845,6 +7847,11 @@ public class WebView extends AbsoluteLayout
setKeepScreenOn(msg.arg1 == 1);
break;
case ENTER_FULLSCREEN_VIDEO:
int layerId = msg.arg1;
Log.v(LOGTAG, "Display the video layer " + layerId + " fullscreen");
break;
case SHOW_FULLSCREEN: {
View view = (View) msg.obj;
int npp = msg.arg1;

9
core/java/android/webkit/WebViewCore.java
View File

@ -480,6 +480,15 @@ final class WebViewCore {
mCallbackProxy.setInstallableWebApp();
}
/**
* Notify the webview that we want to display the video layer fullscreen.
*/
protected void enterFullscreenForVideoLayer(int layerId) {
if (mWebView == null) return;
Message.obtain(mWebView.mPrivateHandler,
WebView.ENTER_FULLSCREEN_VIDEO, layerId, 0).sendToTarget();
}
//-------------------------------------------------------------------------
// JNI methods
//-------------------------------------------------------------------------