resolved conflicts for merge of d2607118 to master (45991bc1) · Commits · e / os / android_frameworks_base

core/java/android/webkit/HTML5VideoViewProxy.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -138,6 +138,10 @@ class HTML5VideoViewProxy extends Handler
		mCurrentProxy.dispatchOnEnded();
		else
		mCurrentProxy.dispatchOnPaused();

		// Re enable plugin views.
		mCurrentProxy.getWebView().getViewManager().showAll();

		isVideoSelfEnded = false;
		mCurrentProxy = null;
		mLayout.removeView(mVideoView);
		@@ -199,6 +203,9 @@ class HTML5VideoViewProxy extends Handler
		mTimer = new Timer();
		mVideoView.start();
		client.onShowCustomView(mLayout, mCallback);
		// Plugins like Flash will draw over the video so hide
		// them while we're playing.
		mCurrentProxy.getWebView().getViewManager().hideAll();
		}

		public static boolean isPlaying(HTML5VideoViewProxy proxy) {
		@@ -599,6 +606,10 @@ class HTML5VideoViewProxy extends Handler
		return new HTML5VideoViewProxy(webViewCore.getWebView(), nativePtr);
		}

		/* package */ WebView getWebView() {
		return mWebView;
		}

		private native void nativeOnPrepared(int duration, int width, int height, int nativePointer);
		private native void nativeOnEnded(int nativePointer);
		private native void nativeOnPaused(int nativePointer);

+4 −0

Original line number	Diff line number	Diff line
		@@ -7706,6 +7706,10 @@ public class WebView extends AbsoluteLayout
		mWebViewCore.sendMessage(EventHub.AUTOFILL_FORM, autoFillQueryId, /* unused */0);
		}

		/* package */ ViewManager getViewManager() {
		return mViewManager;
		}

		private native int nativeCacheHitFramePointer();
		private native Rect nativeCacheHitNodeBounds();
		private native int nativeCacheHitNodePointer();