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

Commit 68226b79 authored by Artem Shvadskiy's avatar Artem Shvadskiy
Browse files

Fix a crash when moving from overlay to non-overlay installation. 

Change-Id: Ia41f230078333e1ac67c360a6a4030550380e522
parent 3c30f3ec

src/com/android/launcher3/FolderIcon.java

+4 −0
Original line number Diff line number Diff line
@@ -173,6 +173,10 @@ public class FolderIcon extends FrameLayout implements FolderListener { 
        Folder folder;

        if (folderInfo.isRemote()) {

            folder = launcher.getRemoteFolderManager().createRemoteFolder(icon, launcher.getDragLayer());

            if (folder == null) {

                LauncherModel.deleteItemFromDatabase(launcher, folderInfo);

                return null;

            }

        } else {

            folder = Folder.fromXml(launcher, launcher.getDragLayer());

        }

src/com/android/launcher3/Launcher.java

+5 −3
Original line number Diff line number Diff line
@@ -4948,9 +4948,11 @@ public class Launcher extends Activity 
                    final FolderIcon newFolder = FolderIcon.fromXml(R.layout.folder_icon, this,

                            (ViewGroup) workspace.getChildAt(workspace.getCurrentPage()),

                            (FolderInfo) item, mIconCache);

                    if (newFolder != null) {

                        newFolder.setTextVisible(!mHideIconLabels);

                        workspace.addInScreenFromBind(newFolder, item.container, item.screenId, item.cellX,

                                item.cellY, 1, 1);

                    }

                    break;

                default:

                    throw new RuntimeException("Invalid Item Type");