commit 8a6870101c3d99257fc050d11bb69f50f5240622
author Winson Chung <winsonc@google.com> Mon Aug 19 23:54:56 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 19 23:54:56 2013 +0000
tree 3696d0617e95e129b3355f6d041ba8ba49c10ade
parent e341d30a13c37ef321aee841592d7d58fe3818d9
parent 76828c87ddb50ee3b423ef26f36387a2f03fd562

Merge "Ensuring that we don't clobber workspace screens map when new apps are added." into jb-ub-gel-agar

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 876b2f6..ab2bc67 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -647,6 +647,9 @@
     @Override
     protected void onActivityResult(
             final int requestCode, final int resultCode, final Intent data) {
+        // Reset the startActivity waiting flag
+        mWaitingForResult = false;
+
         if (requestCode == REQUEST_BIND_APPWIDGET) {
             int appWidgetId = data != null ?
                     data.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1) : -1;
@@ -660,7 +663,6 @@
         boolean delayExitSpringLoadedMode = false;
         boolean isWidgetDrop = (requestCode == REQUEST_PICK_APPWIDGET ||
                 requestCode == REQUEST_CREATE_APPWIDGET);
-        mWaitingForResult = false;
 
         // We have special handling for widgets
         if (isWidgetDrop) {