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

am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb

Browse Source 
* commit '691d43c35fb953c2f70830d3ebd890a43b54cae3':
  Fixed LayoutTransition bug moving multiple views
This commit is contained in:
Chet Haase
2011-01-28 16:23:45 -08:00
committed by Android Git Automerger
parent 6a18f6e289 691d43c35f
commit ec5de0874f
1 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/java/android/animation/LayoutTransition.java
View File

@@ -166,6 +166,7 @@ public class LayoutTransition {
* we cache all of the current animations in this map for possible cancellation on * we cache all of the current animations in this map for possible cancellation on
* another layout event. * another layout event.
*/ */
private final HashMap<View, Animator> pendingAnimations = new HashMap<View, Animator>();
private final HashMap<View, Animator> currentChangingAnimations = new HashMap<View, Animator>(); private final HashMap<View, Animator> currentChangingAnimations = new HashMap<View, Animator>();
private final HashMap<View, Animator> currentVisibilityAnimations = private final HashMap<View, Animator> currentVisibilityAnimations =
new HashMap<View, Animator>(); new HashMap<View, Animator>();
@@ -542,6 +543,8 @@ public class LayoutTransition {
// reset the inter-animation delay, in case we use it later // reset the inter-animation delay, in case we use it later
staggerDelay = 0; staggerDelay = 0;
final long duration = (changeReason == APPEARING) ?
mChangingAppearingDuration : mChangingDisappearingDuration;
final ViewTreeObserver observer = parent.getViewTreeObserver(); // used for later cleanup final ViewTreeObserver observer = parent.getViewTreeObserver(); // used for later cleanup
if (!observer.isAlive()) { if (!observer.isAlive()) {
@@ -556,12 +559,6 @@ public class LayoutTransition {
// only animate the views not being added or removed // only animate the views not being added or removed
if (child != newView) { if (child != newView) {
// If there's an animation running on this view already, cancel it
Animator currentAnimation = currentChangingAnimations.get(child);
if (currentAnimation != null) {
currentAnimation.cancel();
currentChangingAnimations.remove(child);
}
// Make a copy of the appropriate animation // Make a copy of the appropriate animation
final Animator anim = baseAnimator.clone(); final Animator anim = baseAnimator.clone();
@@ -573,6 +570,30 @@ public class LayoutTransition {
// its target object // its target object
anim.setupStartValues(); anim.setupStartValues();
// If there's an animation running on this view already, cancel it
Animator currentAnimation = pendingAnimations.get(child);
if (currentAnimation != null) {
currentAnimation.cancel();
pendingAnimations.remove(child);
}
// Cache the animation in case we need to cancel it later
pendingAnimations.put(child, anim);
// For the animations which don't get started, we have to have a means of
// removing them from the cache, lest we leak them and their target objects.
// We run an animator for the default duration+100 (an arbitrary time, but one
// which should far surpass the delay between setting them up here and
// handling layout events which start them.
ValueAnimator pendingAnimRemover = ValueAnimator.ofFloat(0f, 1f).
setDuration(duration+100);
pendingAnimRemover.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
pendingAnimations.remove(child);
}
});
pendingAnimRemover.start();
// Add a listener to track layout changes on this view. If we don't get a callback, // Add a listener to track layout changes on this view. If we don't get a callback,
// then there's nothing to animate. // then there's nothing to animate.
final View.OnLayoutChangeListener listener = new View.OnLayoutChangeListener() { final View.OnLayoutChangeListener listener = new View.OnLayoutChangeListener() {
@@ -583,19 +604,25 @@ public class LayoutTransition {
anim.setupEndValues(); anim.setupEndValues();
long startDelay; long startDelay;
long duration;
if (changeReason == APPEARING) { if (changeReason == APPEARING) {
startDelay = mChangingAppearingDelay + staggerDelay; startDelay = mChangingAppearingDelay + staggerDelay;
staggerDelay += mChangingAppearingStagger; staggerDelay += mChangingAppearingStagger;
duration = mChangingAppearingDuration;
} else { } else {
startDelay = mChangingDisappearingDelay + staggerDelay; startDelay = mChangingDisappearingDelay + staggerDelay;
staggerDelay += mChangingDisappearingStagger; staggerDelay += mChangingDisappearingStagger;
duration = mChangingDisappearingDuration;
} }
anim.setStartDelay(startDelay); anim.setStartDelay(startDelay);
anim.setDuration(duration); anim.setDuration(duration);
Animator prevAnimation = currentChangingAnimations.get(child);
if (prevAnimation != null) {
prevAnimation.cancel();
currentChangingAnimations.remove(child);
}
Animator pendingAnimation = pendingAnimations.get(child);
if (pendingAnimation != null) {
pendingAnimations.remove(child);
}
// Cache the animation in case we need to cancel it later // Cache the animation in case we need to cancel it later
currentChangingAnimations.put(child, anim); currentChangingAnimations.put(child, anim);