Merge "Fix issue with LayoutTransition on non-visible windows." (3791dc9b) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+7 −11

Original line number	Diff line number	Diff line
		@@ -1575,13 +1575,13 @@ public final class ViewRootImpl extends Handler implements ViewParent,
		boolean cancelDraw = attachInfo.mTreeObserver.dispatchOnPreDraw() \|\|
		viewVisibility != View.VISIBLE;

		if (!cancelDraw && !newSurface) {
		if (mPendingTransitions != null && mPendingTransitions.size() > 0) {
		for (int i = 0; i < mPendingTransitions.size(); ++i) {
		mPendingTransitions.get(i).startChangingAnimations();
		}
		mPendingTransitions.clear();
		}
		if (!cancelDraw && !newSurface) {
		mFullRedrawNeeded = false;

		final long drawStartTime;
		@@ -1619,10 +1619,6 @@ public final class ViewRootImpl extends Handler implements ViewParent,
		}
		}
		} else {
		// If we're not drawing, then we don't need to draw the transitions, either
		if (mPendingTransitions != null) {
		mPendingTransitions.clear();
		}

		// We were supposed to report when we are done drawing. Since we canceled the
		// draw, remember it here.