Merge "Revert "Get rid of double measure"" into tm-dev (80832d2e) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -2802,10 +2802,6 @@ public final class ViewRootImpl implements ViewParent,
		// Execute enqueued actions on every traversal in case a detached view enqueued an action
		getRunQueue().executeActions(mAttachInfo.mHandler);

		if (mApplyInsetsRequested) {
		dispatchApplyInsets(host);
		}

		if (mFirst) {
		// make sure touch mode code executes by setting cached value
		// to opposite of the added touch mode.
		@@ -2869,6 +2865,18 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		if (mApplyInsetsRequested) {
		dispatchApplyInsets(host);
		if (mLayoutRequested) {
		// Short-circuit catching a new layout request here, so
		// we don't need to go through two layout passes when things
		// change due to fitting system windows, which can happen a lot.
		windowSizeMayChange \|= measureHierarchy(host, lp,
		mView.getContext().getResources(),
		desiredWindowWidth, desiredWindowHeight);
		}
		}

		if (layoutRequested) {
		// Clear this now, so that if anything requests a layout in the
		// rest of this function we will catch it and re-run a full