commit 1fafd719cb4c960448010e5fbdd8cc2634bd347d
author Tony Wickham <twickham@google.com> Wed Feb 01 19:10:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 01 19:10:37 2017 +0000
tree 3c7d64264b8a3fb1d34a28f054f93aa202027cea
parent 5a2edd65f2ca3d83b1672835831e2f5b2f16ab82
parent 4d096298ce44d9b979ca0897032421e26392ae59

Merge "Ensure getNotificationKeysForItem() returns empty on unsupported items." into ub-launcher3-master

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 72dff66..d2008a6 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2042,14 +2042,18 @@
      */
     public Animator setStateWithAnimation(State toState, boolean animated,
             AnimationLayerSet layerViews) {
-        // Create the animation to the new state
-        AnimatorSet workspaceAnim =  mStateTransitionAnimation.getAnimationToState(mState,
-                toState, animated, layerViews);
+        final State fromState = mState;
 
-        boolean shouldNotifyWidgetChange = !mState.shouldUpdateWidget
-                && toState.shouldUpdateWidget;
         // Update the current state
         mState = toState;
+
+        // Create the animation to the new state
+        AnimatorSet workspaceAnim =  mStateTransitionAnimation.getAnimationToState(fromState,
+                toState, animated, layerViews);
+
+        boolean shouldNotifyWidgetChange = !fromState.shouldUpdateWidget
+                && toState.shouldUpdateWidget;
+
         updateAccessibilityFlags();
 
         if (shouldNotifyWidgetChange) {