commit 3e3f44c3ade314c6186332d081c7d4d1a39155db
author Sunny Goyal <sunnygoyal@google.com> Mon Oct 23 17:14:52 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Oct 25 13:41:13 2017 -0700
tree b40896dac9f579f95cb3dbd7ad295e39e5ded6cf
parent 4d519f25687a95d450666cf8452b9ba57bd36eb9

Exposing the state manager directly instead of providing various helper methods for state change

Bug: 67678570
Change-Id: If3d05c804c034ffa5e403da8eaa23e85e373c863

src/com/android/launcher3/ButtonDropTarget.java

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 1a1c319..bebdbdb 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -16,7 +16,7 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_NEXT_FRAME;
+import static com.android.launcher3.LauncherState.NORMAL;
 
 import android.animation.AnimatorSet;
 import android.animation.FloatArrayEvaluator;
@@ -231,7 +231,7 @@
             public void run() {
                 completeDrop(d);
                 mDropTargetBar.onDragEnd();
-                mLauncher.exitSpringLoadedDragMode(SPRING_LOADED_EXIT_NEXT_FRAME);
+                mLauncher.getStateManager().goToState(NORMAL);
             }
         };
         dragLayer.animateView(d.dragView, from, to, scale, 1f, 1f, 0.1f, 0.1f,