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

Merge "Fixing animation regression due to ag/957220." into nyc-dev

Browse Source
This commit is contained in:
Winson Chung
2016-04-25 16:25:49 +00:00
committed by Android (Google) Code Review
parent 096e2dcf85 60df24648e
commit de91709935
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
View File

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

4
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
View File

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