commit fb5a4d843eee5d041c6ca4d6acb7699824470dbd
author Sunny Goyal <sunnygoyal@google.com> Mon Nov 16 04:47:01 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 16 04:47:01 2015 +0000
tree 85c50e127f9940c65322596c1fda89835c9cab02
parent ec73dd97f08e243dbd94b699a2303fd1c9fe7c05
parent b9c29d455e301d1b31b911a37eb3bec7e0e16865

Fixing crash when uninstalling an app destroys the folder
am: b9c29d455e

* commit 'b9c29d455e301d1b31b911a37eb3bec7e0e16865':
  Fixing crash when uninstalling an app destroys the folder

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 27572e3..5275508 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -1145,10 +1145,10 @@
                         // addInScreenFromBind() to ensure that hotseat items are placed correctly.
                         mLauncher.getWorkspace().addInScreenFromBind(newIcon, mInfo.container,
                                 mInfo.screenId, mInfo.cellX, mInfo.cellY, mInfo.spanX, mInfo.spanY);
-                    }
 
-                    // Focus the newly created child
-                    newIcon.requestFocus();
+                        // Focus the newly created child
+                        newIcon.requestFocus();
+                    }
                 }
             }
         };
@@ -1294,7 +1294,11 @@
             rearrangeChildren();
         }
         if (getItemCount() <= 1) {
-            replaceFolderWithFinalItem();
+            if (mInfo.opened) {
+                mLauncher.closeFolder(this, true);
+            } else {
+                replaceFolderWithFinalItem();
+            }
         }
     }