diff options
| author | Winson Chung <winsonc@google.com> | 2013-08-16 14:31:00 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-08-16 14:31:43 -0700 |
| commit | e341d30a13c37ef321aee841592d7d58fe3818d9 (patch) | |
| tree | 0376d0ca103ad94fed15af241cc0a63dc59e7879 | |
| parent | 430b79fd0e7255386b31ac4130b26124aa93b059 (diff) | |
| download | android_packages_apps_Trebuchet-e341d30a13c37ef321aee841592d7d58fe3818d9.tar.gz android_packages_apps_Trebuchet-e341d30a13c37ef321aee841592d7d58fe3818d9.tar.bz2 android_packages_apps_Trebuchet-e341d30a13c37ef321aee841592d7d58fe3818d9.zip | |
Fixing issue where widgets could not be picked up after the bind-dialog shows. (Bug 10332119)
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 890c632f8..7f130c0c0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -647,6 +647,9 @@ public class Launcher extends Activity @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 @@ public class Launcher extends Activity boolean delayExitSpringLoadedMode = false; boolean isWidgetDrop = (requestCode == REQUEST_PICK_APPWIDGET || requestCode == REQUEST_CREATE_APPWIDGET); - mWaitingForResult = false; // We have special handling for widgets if (isWidgetDrop) { |