Merge "Invoke requestLayout() when drawables have different sizes. Bug #5142668" (7fa6e424) · Commits · e / os / android_frameworks_base

core/java/android/widget/ImageView.java

+17 −36

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@ public class ImageView extends View {
		// Avoid allocations...
		private RectF mTempSrc = new RectF();
		private RectF mTempDst = new RectF();
		private float[] mTempPoints;

		private boolean mCropToPadding;

		@@ -347,29 +346,13 @@ public class ImageView extends View {
		if (mDrawable != drawable) {
		mResource = 0;
		mUri = null;

		int oldWidth = mDrawableWidth;
		int oldHeight = mDrawableHeight;
		updateDrawable(drawable);

		boolean needsLayout;
		if (mScaleType == ScaleType.CENTER) {
		needsLayout = mDrawableWidth != oldWidth \|\| mDrawableHeight != oldHeight;
		} else {
		if (mTempPoints == null) {
		mTempPoints = new float[4];
		}
		float[] points = mTempPoints;
		points[0] = oldWidth;
		points[1] = oldHeight;
		points[2] = mDrawableWidth;
		points[3] = mDrawableHeight;
		if (!mMatrix.isIdentity()) {
		mMatrix.mapPoints(points);
		}
		needsLayout = points[0] != points[2] \|\| points[1] != points[3];
		}
		updateDrawable(drawable);

		if (needsLayout) {
		if (oldWidth != mDrawableWidth \|\| oldHeight != mDrawableHeight) {
		requestLayout();
		}
		invalidate();
		@@ -621,6 +604,8 @@ public class ImageView extends View {
		mDrawableHeight = d.getIntrinsicHeight();
		applyColorMod();
		configureBounds();
		} else {
		mDrawableWidth = mDrawableHeight = -1;
		}
		}

		@@ -705,12 +690,10 @@ public class ImageView extends View {
		*/

		// Get the max possible width given our constraints
		widthSize = resolveAdjustedSize(w + pleft + pright,
		mMaxWidth, widthMeasureSpec);
		widthSize = resolveAdjustedSize(w + pleft + pright, mMaxWidth, widthMeasureSpec);

		// Get the max possible height given our constraints
		heightSize = resolveAdjustedSize(h + ptop + pbottom,
		mMaxHeight, heightMeasureSpec);
		heightSize = resolveAdjustedSize(h + ptop + pbottom, mMaxHeight, heightMeasureSpec);

		if (desiredAspect != 0.0f) {
		// See what our actual aspect ratio is
		@@ -723,9 +706,8 @@ public class ImageView extends View {

		// Try adjusting width to be proportional to height
		if (resizeWidth) {
		int newWidth = (int)(desiredAspect *
		(heightSize - ptop - pbottom))
		+ pleft + pright;
		int newWidth = (int)(desiredAspect * (heightSize - ptop - pbottom)) +
		pleft + pright;
		if (newWidth <= widthSize) {
		widthSize = newWidth;
		done = true;
		@@ -734,8 +716,8 @@ public class ImageView extends View {

		// Try adjusting height to be proportional to width
		if (!done && resizeHeight) {
		int newHeight = (int)((widthSize - pleft - pright)
		/ desiredAspect) + ptop + pbottom;
		int newHeight = (int)((widthSize - pleft - pright) / desiredAspect) +
		ptop + pbottom;
		if (newHeight <= heightSize) {
		heightSize = newHeight;
		}
		@@ -874,8 +856,7 @@ public class ImageView extends View {
		mTempDst.set(0, 0, vwidth, vheight);

		mDrawMatrix = mMatrix;
		mDrawMatrix.setRectToRect(mTempSrc, mTempDst,
		scaleTypeToScaleToFit(mScaleType));
		mDrawMatrix.setRectToRect(mTempSrc, mTempDst, scaleTypeToScaleToFit(mScaleType));
		}
		}
		}