Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1 (f10615d8) · Commits · e / os / android_frameworks_base

core/java/android/widget/StackView.java

+17 −5

Original line number	Diff line number	Diff line
		@@ -531,6 +531,8 @@ public class StackView extends AdapterViewAnimator {

		@Override
		protected void dispatchDraw(Canvas canvas) {
		boolean expandClipRegion = false;

		canvas.getClipBounds(stackInvalidateRect);
		final int childCount = getChildCount();
		for (int i = 0; i < childCount; i++) {
		@@ -540,12 +542,22 @@ public class StackView extends AdapterViewAnimator {
		child.getAlpha() == 0f \|\| child.getVisibility() != VISIBLE) {
		lp.resetInvalidateRect();
		}
		stackInvalidateRect.union(lp.getInvalidateRect());
		Rect childInvalidateRect = lp.getInvalidateRect();
		if (!childInvalidateRect.isEmpty()) {
		expandClipRegion = true;
		stackInvalidateRect.union(childInvalidateRect);
		}
		}

		// We only expand the clip bounds if necessary.
		if (expandClipRegion) {
		canvas.save(Canvas.CLIP_SAVE_FLAG);
		canvas.clipRect(stackInvalidateRect, Region.Op.UNION);
		super.dispatchDraw(canvas);
		canvas.restore();
		} else {
		super.dispatchDraw(canvas);
		}
		}

		private void onLayout() {