Merge "Clear animation state before dumping old views" into nyc-dev

2016-03-09 16:13:54 +00:00
parent 2c18cd0823 bc8ffc2ff2
commit c297036643
1 changed files with 1 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
@@ -138,6 +138,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
        firstPageBuilder.setListener(this);
        // Fade in the tiles/labels as we reach the final position.
        firstPageDelayedBuilder.addFloat(mQsPanel.getTileLayout(), "alpha", 0, 1);
+        clearAnimationState();
        mAllViews.clear();
        mTopFiveQs.clear();
        mAllViews.add((View) mQsPanel.getTileLayout());