Merge "Make UNSPECIFIED measure spec include size hint." (05636471) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -20432,11 +20432,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		static int adjust(int measureSpec, int delta) {
		final int mode = getMode(measureSpec);
		int size = getSize(measureSpec);
		if (mode == UNSPECIFIED) {
		// No need to adjust size for UNSPECIFIED mode.
		return makeMeasureSpec(0, UNSPECIFIED);
		return makeMeasureSpec(size, UNSPECIFIED);
		}
		int size = getSize(measureSpec) + delta;
		size += delta;
		if (size < 0) {
		Log.e(VIEW_LOG_TAG, "MeasureSpec.adjust: new size would be negative! (" + size +
		") spec: " + toString(measureSpec) + " delta: " + delta);

core/java/android/widget/FastScroller.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -662,7 +662,8 @@ class FastScroller {

		final int adjMaxWidth = maxWidth - marginLeft - marginRight;
		final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(adjMaxWidth, MeasureSpec.AT_MOST);
		final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
		final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(container.height(),
		MeasureSpec.UNSPECIFIED);
		view.measure(widthMeasureSpec, heightMeasureSpec);

		// Align to the left or right.
		@@ -701,7 +702,8 @@ class FastScroller {
		final int containerWidth = container.width();
		final int adjMaxWidth = containerWidth - marginLeft - marginRight;
		final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(adjMaxWidth, MeasureSpec.AT_MOST);
		final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
		final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(container.height(),
		MeasureSpec.UNSPECIFIED);
		preview.measure(widthMeasureSpec, heightMeasureSpec);

		// Align at the vertical center, 10% from the top.
		@@ -766,7 +768,8 @@ class FastScroller {
		final Rect container = mContainerRect;
		final int maxWidth = container.width();
		final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST);
		final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
		final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(container.height(),
		MeasureSpec.UNSPECIFIED);
		track.measure(widthMeasureSpec, heightMeasureSpec);

		final int top;

core/java/android/widget/GridView.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1071,7 +1071,8 @@ public class GridView extends AbsListView {
		p.forceAdd = true;

		int childHeightSpec = getChildMeasureSpec(
		MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), 0, p.height);
		MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(heightMeasureSpec),
		MeasureSpec.UNSPECIFIED), 0, p.height);
		int childWidthSpec = getChildMeasureSpec(
		MeasureSpec.makeMeasureSpec(mColumnWidth, MeasureSpec.EXACTLY), 0, p.width);
		child.measure(childWidthSpec, childHeightSpec);

core/java/android/widget/LinearLayout.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -1058,8 +1058,11 @@ public class LinearLayout extends ViewGroup {
		// use as much space as it wants because we can shrink things
		// later (and re-measure).
		if (baselineAligned) {
		final int freeSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
		child.measure(freeSpec, freeSpec);
		final int freeWidthSpec = MeasureSpec.makeMeasureSpec(
		MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.UNSPECIFIED);
		final int freeHeightSpec = MeasureSpec.makeMeasureSpec(
		MeasureSpec.getSize(heightMeasureSpec), MeasureSpec.UNSPECIFIED);
		child.measure(freeWidthSpec, freeHeightSpec);
		} else {
		skippedMeasure = true;
		}

core/java/android/widget/ListView.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -1155,7 +1155,7 @@ public class ListView extends AbsListView {
		heightMode == MeasureSpec.UNSPECIFIED)) {
		final View child = obtainView(0, mIsScrap);

		measureScrapChild(child, 0, widthMeasureSpec);
		measureScrapChild(child, 0, widthMeasureSpec, heightSize);

		childWidth = child.getMeasuredWidth();
		childHeight = child.getMeasuredHeight();
		@@ -1188,7 +1188,7 @@ public class ListView extends AbsListView {
		mWidthMeasureSpec = widthMeasureSpec;
		}

		private void measureScrapChild(View child, int position, int widthMeasureSpec) {
		private void measureScrapChild(View child, int position, int widthMeasureSpec, int heightHint) {
		LayoutParams p = (LayoutParams) child.getLayoutParams();
		if (p == null) {
		p = (AbsListView.LayoutParams) generateDefaultLayoutParams();
		@@ -1204,7 +1204,7 @@ public class ListView extends AbsListView {
		if (lpHeight > 0) {
		childHeightSpec = MeasureSpec.makeMeasureSpec(lpHeight, MeasureSpec.EXACTLY);
		} else {
		childHeightSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
		childHeightSpec = MeasureSpec.makeMeasureSpec(heightHint, MeasureSpec.UNSPECIFIED);
		}
		child.measure(childWidthSpec, childHeightSpec);
		}
		@@ -1271,7 +1271,7 @@ public class ListView extends AbsListView {
		for (i = startPosition; i <= endPosition; ++i) {
		child = obtainView(i, isScrap);

		measureScrapChild(child, i, widthMeasureSpec);
		measureScrapChild(child, i, widthMeasureSpec, maxHeight);

		if (i > 0) {
		// Count the divider for all but one child
		@@ -1941,7 +1941,8 @@ public class ListView extends AbsListView {
		if (lpHeight > 0) {
		childHeightSpec = MeasureSpec.makeMeasureSpec(lpHeight, MeasureSpec.EXACTLY);
		} else {
		childHeightSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
		childHeightSpec = MeasureSpec.makeMeasureSpec(getMeasuredHeight(),
		MeasureSpec.UNSPECIFIED);
		}
		child.measure(childWidthSpec, childHeightSpec);
		} else {
		@@ -2695,7 +2696,8 @@ public class ListView extends AbsListView {
		if (lpHeight > 0) {
		childHeightSpec = MeasureSpec.makeMeasureSpec(lpHeight, MeasureSpec.EXACTLY);
		} else {
		childHeightSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
		childHeightSpec = MeasureSpec.makeMeasureSpec(getMeasuredHeight(),
		MeasureSpec.UNSPECIFIED);
		}
		child.measure(childWidthSpec, childHeightSpec);
		}