Fix issue where launcher didn't return to workspace on screen off (issue 5628744)

Change-Id: Ic058cf7a803d2fe7be98325138cd5bd52a96cd9c

src/com/android/launcher2/Launcher.java

@@ -505,9 +505,6 @@ public final class Launcher extends Activity
                 // We just wanted the activity result here so we can clear mWaitingForResult
                 break;
         }
-        // In any situation where we have a multi-step drop, we should reset the add info only after
-        // we complete the drop
-        resetAddInfo();
         return result;
     }
 
@@ -998,6 +995,7 @@ public final class Launcher extends Activity
 
             addWidgetToAutoAdvanceIfNeeded(launcherInfo.hostView, appWidgetInfo);
         }
+        resetAddInfo();
     }
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

src/com/android/launcher2/Workspace.java

@@ -17,8 +17,6 @@
 package com.android.launcher2;
 
 import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
-import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;