| commit | 60df24648e7ce6293124256ea565615f88df3c38 | [log] [tgz] |
|---|---|---|
| author | Winson <winsonc@google.com> | Sat Apr 23 16:06:50 2016 -0700 |
| committer | Winson Chung <winsonc@google.com> | Mon Apr 25 16:01:03 2016 +0000 |
| tree | a7b91e3f008fa9cd4aaa9aa33c49ad2f1c1f32cb | |
| parent | b02d51b3d31b1a49ddc7c7e7db97b576d6e4f78f [diff] |
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
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java index fc7bba5..270d981 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
@@ -416,7 +416,7 @@ int prevFocusState = mFocusState; mFocusState = focusState; updateFrontBackTransforms(); - if (mCb != null && (prevFocusState != focusState)) { + if (mCb != null) { mCb.onFocusStateChanged(prevFocusState, focusState); } }
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 6732b17..a158482 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -1664,10 +1664,10 @@ 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());