From 6af9af057f2e40c54a4ed447c4628eef7dc15683 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 2 Feb 2012 15:41:45 -0800
Subject: [PATCH] Fix issue where launcher didn't return to workspace on screen
 off (issue 5628744)

Change-Id: Ic058cf7a803d2fe7be98325138cd5bd52a96cd9c
---
 src/com/android/launcher2/Launcher.java  | 4 +---
 src/com/android/launcher2/Workspace.java | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 6ac9fe213f..7d974a513a 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/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() {
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 4e03b757cb..746c682299 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/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;