Merge "Update touch mode regardless of mStopped" into tm-dev (88fdb7aa) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -2767,17 +2767,16 @@ public final class ViewRootImpl implements ViewParent,
		dispatchApplyInsets(host);
		}

		boolean layoutRequested = mLayoutRequested && (!mStopped \|\| mReportNextDraw);
		if (layoutRequested) {

		final Resources res = mView.getContext().getResources();

		if (mFirst) {
		// make sure touch mode code executes by setting cached value
		// to opposite of the added touch mode.
		mAttachInfo.mInTouchMode = !mAddedTouchMode;
		ensureTouchModeLocally(mAddedTouchMode);
		} else {
		}

		boolean layoutRequested = mLayoutRequested && (!mStopped \|\| mReportNextDraw);
		if (layoutRequested) {
		if (!mFirst) {
		if (lp.width == ViewGroup.LayoutParams.WRAP_CONTENT
		\|\| lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) {
		windowSizeMayChange = true;
		@@ -2797,7 +2796,7 @@ public final class ViewRootImpl implements ViewParent,
		}

		// Ask host how big it wants to be
		windowSizeMayChange \|= measureHierarchy(host, lp, res,
		windowSizeMayChange \|= measureHierarchy(host, lp, mView.getContext().getResources(),
		desiredWindowWidth, desiredWindowHeight);
		}