commit 917e38851cbc6caffe1f8dade4db452bace522ba
author Adam Cohen <adamcohen@google.com> Thu Oct 31 15:03:35 2013 -0700
committer Adam Cohen <adamcohen@google.com> Thu Oct 31 15:04:59 2013 -0700
tree 86b3ec601f02ece219acf412509182cb26bdd392
parent 3b185e2513bcc3318753c21d3909d8dab2291e31

Fix issue with adding widget with config activity to empty screen (issue 11381059)

Change-Id: Ic7eecb30422e7a6cf35ebe8470d9eba8752d406e

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8e29b40..5bd0bc6 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -671,7 +671,8 @@
         CellLayout finalScreen = mWorkspaceScreens.get(finalScreenId);
 
         // If the final screen is empty, convert it to the extra empty screen
-        if (finalScreen.getShortcutsAndWidgets().getChildCount() == 0) {
+        if (finalScreen.getShortcutsAndWidgets().getChildCount() == 0 &&
+                !finalScreen.isDropPending()) {
             mWorkspaceScreens.remove(finalScreenId);
             mScreenOrder.remove(finalScreenId);