am ebc9d317: Merge "Handle non-started LayoutTransition animations correctly" into jb-dev (3662fe5e) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewGroup.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -997,13 +997,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		mTransition.showChild(this, child, oldVisibility);
		} else {
		mTransition.hideChild(this, child, newVisibility);
		if (mTransitioningViews != null && mTransitioningViews.contains(child)) {
		// Only track this on disappearing views - appearing views are already visible
		// and don't need special handling during drawChild()
		if (mVisibilityChangingChildren == null) {
		mVisibilityChangingChildren = new ArrayList<View>();
		}
		mVisibilityChangingChildren.add(child);
		if (mTransitioningViews != null && mTransitioningViews.contains(child)) {
		addDisappearingView(child);
		}
		}