Fixing animation regression due to ag/957220.

- Ensure we clear deferred relayouts after finishing all animations in
  case they trigger a deferred layout in the animation-end callback.

Bug: 28287904
Change-Id: I6d71328fb3dc4595ea67ee18cfa57d85d741e6c6
This commit is contained in:
Winson
2016-04-23 16:06:50 -07:00
committed by Winson Chung
parent b02d51b3d3
commit 60df24648e
2 changed files with 3 additions and 3 deletions

View File

@@ -416,7 +416,7 @@ public class TaskStackLayoutAlgorithm {
int prevFocusState = mFocusState;
mFocusState = focusState;
updateFrontBackTransforms();
if (mCb != null && (prevFocusState != focusState)) {
if (mCb != null) {
mCb.onFocusStateChanged(prevFocusState, focusState);
}
}

View File

@@ -1664,10 +1664,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
public final void onBusEvent(DismissRecentsToHomeAnimationStarted event) {
// Stop any scrolling
cancelDeferredTaskViewLayoutAnimation();
mTouchHandler.finishAnimations();
mStackScroller.stopScroller();
mStackScroller.stopBoundScrollAnimation();
mTouchHandler.finishAnimations();
cancelDeferredTaskViewLayoutAnimation();
// Start the task animations
mAnimationHelper.startExitToHomeAnimation(event.animated, event.getAnimationTrigger());