Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b95b14f authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Quick patch for b/12446428." into jb-ub-now-kermit

parents 5317c2b7 0eb687fd

src/com/android/launcher3/Folder.java

+4 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,10 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
                if (getItemCount() <= 1) {

                    // Remove the folder

                    LauncherModel.deleteItemFromDatabase(mLauncher, mInfo);

                    if (cellLayout != null) {

                        // b/12446428 -- sometimes the cell layout has already gone away?

                        cellLayout.removeView(mFolderIcon);

                    }

                    if (mFolderIcon instanceof DropTarget) {

                        mDragController.removeDropTarget((DropTarget) mFolderIcon);

                    }