Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue with LayoutTransition on non-visible windows."

Browse Source
This commit is contained in:
Chet Haase
2011-09-06 22:36:13 -07:00
committed by Android (Google) Code Review
parent 7211dbabc5 61158c621d
commit 3791dc9b1c
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/view/ViewRootImpl.java
View File

@@ -1575,13 +1575,13 @@ public final class ViewRootImpl extends Handler implements ViewParent,
boolean cancelDraw = attachInfo.mTreeObserver.dispatchOnPreDraw() || boolean cancelDraw = attachInfo.mTreeObserver.dispatchOnPreDraw() ||
viewVisibility != View.VISIBLE; viewVisibility != View.VISIBLE;
if (!cancelDraw && !newSurface) { if (mPendingTransitions != null && mPendingTransitions.size() > 0) {
if (mPendingTransitions != null && mPendingTransitions.size() > 0) { for (int i = 0; i < mPendingTransitions.size(); ++i) {
for (int i = 0; i < mPendingTransitions.size(); ++i) { mPendingTransitions.get(i).startChangingAnimations();
mPendingTransitions.get(i).startChangingAnimations();
}
mPendingTransitions.clear();
} }
mPendingTransitions.clear();
}
if (!cancelDraw && !newSurface) {
mFullRedrawNeeded = false; mFullRedrawNeeded = false;
final long drawStartTime; final long drawStartTime;
@@ -1619,10 +1619,6 @@ public final class ViewRootImpl extends Handler implements ViewParent,
} }
} }
} else { } 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 // We were supposed to report when we are done drawing. Since we canceled the
// draw, remember it here. // draw, remember it here.
@@ -1632,7 +1628,7 @@ public final class ViewRootImpl extends Handler implements ViewParent,
if (fullRedrawNeeded) { if (fullRedrawNeeded) {
mFullRedrawNeeded = true; mFullRedrawNeeded = true;
} }
if (viewVisibility == View.VISIBLE) { if (viewVisibility == View.VISIBLE) {
// Try again // Try again
scheduleTraversals(); scheduleTraversals();