Merge "Make VideoView/MediaController behave better" (cccef471) · Commits · e / os / android_frameworks_base

core/java/android/widget/MediaController.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ public class MediaController extends FrameLayout {
		private void initFloatingWindowLayout() {
		mDecorLayoutParams = new WindowManager.LayoutParams();
		WindowManager.LayoutParams p = mDecorLayoutParams;
		p.gravity = Gravity.TOP;
		p.gravity = Gravity.TOP \| Gravity.LEFT;
		p.height = LayoutParams.WRAP_CONTENT;
		p.x = 0;
		p.format = PixelFormat.TRANSLUCENT;
		@@ -167,9 +167,15 @@ public class MediaController extends FrameLayout {
		int [] anchorPos = new int[2];
		mAnchor.getLocationOnScreen(anchorPos);

		// we need to know the size of the controller so we can properly position it
		// within its space
		mDecor.measure(MeasureSpec.makeMeasureSpec(mAnchor.getWidth(), MeasureSpec.AT_MOST),
		MeasureSpec.makeMeasureSpec(mAnchor.getHeight(), MeasureSpec.AT_MOST));

		WindowManager.LayoutParams p = mDecorLayoutParams;
		p.width = mAnchor.getWidth();
		p.y = anchorPos[1] + mAnchor.getHeight();
		p.x = anchorPos[0] + (mAnchor.getWidth() - p.width) / 2;
		p.y = anchorPos[1] + mAnchor.getHeight() - mDecor.getMeasuredHeight();
		}

		// This is called whenever mAnchor's layout bound changes
		@@ -204,6 +210,8 @@ public class MediaController extends FrameLayout {
		/**
		* Set the view that acts as the anchor for the control view.
		* This can for example be a VideoView, or your Activity's main view.
		* When VideoView calls this method, it will use the VideoView's parent
		* as the anchor.
		* @param view The view to which to anchor the controller when it is visible.
		*/
		public void setAnchorView(View view) {

core/java/android/widget/VideoView.java

+52 −38

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.view.MotionEvent;
		import android.view.SurfaceHolder;
		import android.view.SurfaceView;
		import android.view.View;
		import android.view.View.MeasureSpec;
		import android.view.accessibility.AccessibilityEvent;
		import android.view.accessibility.AccessibilityNodeInfo;
		import android.widget.MediaController.MediaPlayerControl;
		@@ -108,23 +109,65 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {

		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		//Log.i("@@@@", "onMeasure");
		//Log.i("@@@@", "onMeasure(" + MeasureSpec.toString(widthMeasureSpec) + ", "
		// + MeasureSpec.toString(heightMeasureSpec) + ")");

		int width = getDefaultSize(mVideoWidth, widthMeasureSpec);
		int height = getDefaultSize(mVideoHeight, heightMeasureSpec);
		if (mVideoWidth > 0 && mVideoHeight > 0) {
		if ( mVideoWidth * height > width * mVideoHeight ) {

		int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
		int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
		int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
		int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);

		if (widthSpecMode == MeasureSpec.EXACTLY && heightSpecMode == MeasureSpec.EXACTLY) {
		// the size is fixed
		width = widthSpecSize;
		height = heightSpecSize;

		// for compatibility, we adjust size based on aspect ratio
		if ( mVideoWidth * height < width * mVideoHeight ) {
		//Log.i("@@@", "image too wide, correcting");
		width = height * mVideoWidth / mVideoHeight;
		} else if ( mVideoWidth * height > width * mVideoHeight ) {
		//Log.i("@@@", "image too tall, correcting");
		height = width * mVideoHeight / mVideoWidth;
		} else if ( mVideoWidth * height < width * mVideoHeight ) {
		//Log.i("@@@", "image too wide, correcting");
		}
		} else if (widthSpecMode == MeasureSpec.EXACTLY) {
		// only the width is fixed, adjust the height to match aspect ratio if possible
		width = widthSpecSize;
		height = width * mVideoHeight / mVideoWidth;
		if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
		// couldn't match aspect ratio within the constraints
		height = heightSpecSize;
		}
		} else if (heightSpecMode == MeasureSpec.EXACTLY) {
		// only the height is fixed, adjust the width to match aspect ratio if possible
		height = heightSpecSize;
		width = height * mVideoWidth / mVideoHeight;
		if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
		// couldn't match aspect ratio within the constraints
		width = widthSpecSize;
		}
		} else {
		//Log.i("@@@", "aspect ratio is correct: " +
		//width+"/"+height+"="+
		//mVideoWidth+"/"+mVideoHeight);
		// neither the width nor the height are fixed, try to use actual video size
		width = mVideoWidth;
		height = mVideoHeight;
		if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
		// too tall, decrease both width and height
		height = heightSpecSize;
		width = height * mVideoWidth / mVideoHeight;
		}
		if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
		// too wide, decrease both width and height
		width = widthSpecSize;
		height = width * mVideoHeight / mVideoWidth;
		}
		}
		} else {
		// no size yet, just adopt the given spec sizes
		}
		//Log.i("@@@@@@@@@@", "setting size: " + width + 'x' + height);
		setMeasuredDimension(width, height);
		}

		@@ -140,35 +183,6 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
		info.setClassName(VideoView.class.getName());
		}

		public int resolveAdjustedSize(int desiredSize, int measureSpec) {
		int result = desiredSize;
		int specMode = MeasureSpec.getMode(measureSpec);
		int specSize = MeasureSpec.getSize(measureSpec);

		switch (specMode) {
		case MeasureSpec.UNSPECIFIED:
		/* Parent says we can be as big as we want. Just don't be larger
		* than max size imposed on ourselves.
		*/
		result = desiredSize;
		break;

		case MeasureSpec.AT_MOST:
		/* Parent says we can be as big as we want, up to specSize.
		* Don't be larger than specSize, and don't be larger than
		* the max size imposed on ourselves.
		*/
		result = Math.min(desiredSize, specSize);
		break;

		case MeasureSpec.EXACTLY:
		// No choice. Do what we are told.
		result = specSize;
		break;
		}
		return result;
		}

		private void initVideoView() {
		mVideoWidth = 0;
		mVideoHeight = 0;