am 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when... (f4b8c343) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -3159,6 +3159,17 @@ public final class ViewRootImpl implements ViewParent,
		return (theParent instanceof ViewGroup) && isViewDescendantOf((View) theParent, parent);
		}

		private static void forceLayout(View view) {
		view.forceLayout();
		if (view instanceof ViewGroup) {
		ViewGroup group = (ViewGroup) view;
		final int count = group.getChildCount();
		for (int i = 0; i < count; i++) {
		forceLayout(group.getChildAt(i));
		}
		}
		}

		private final static int MSG_INVALIDATE = 1;
		private final static int MSG_INVALIDATE_RECT = 2;
		private final static int MSG_DIE = 3;
		@@ -3297,6 +3308,10 @@ public final class ViewRootImpl implements ViewParent,
		mReportNextDraw = true;
		}

		if (mView != null) {
		forceLayout(mView);
		}

		requestLayout();
		}
		break;
		@@ -3311,6 +3326,9 @@ public final class ViewRootImpl implements ViewParent,
		mWinFrame.top = t;
		mWinFrame.bottom = t + h;

		if (mView != null) {
		forceLayout(mView);
		}
		requestLayout();
		}
		break;