drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3662fe5e: am ebc9d317: Merge "Handle non-started LayoutTransition animations correctly" into jb-dev

Browse Source 
* commit '3662fe5e3507ada2a592b8df6120b8cebfb5d8d9':
  Handle non-started LayoutTransition animations correctly
This commit is contained in:
Chet Haase
2012-06-19 16:03:36 -07:00
committed by Android Git Automerger
parent a129a3b0ca 3662fe5e35
commit 73b21cfa50
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/ViewGroup.java
View File

@ -997,13 +997,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
mTransition.showChild(this, child, oldVisibility);
} else {
mTransition.hideChild(this, child, newVisibility);
// 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)) {
// 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);
addDisappearingView(child);
}
}