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

Commit 80028976 authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

Merge "Fix inability to remove or interact with folder when removing 2nd item... 

Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev
parents be4a43c1 326ec97a

src/com/android/launcher3/Launcher.java

+2 −0
Original line number Diff line number Diff line
@@ -2194,6 +2194,8 @@ public class Launcher extends StatefulActivity<LauncherState> 


    /**

     * Returns the CellLayout of the specified container at the specified screen.

     *

     * @param screenId must be presenterPos and not modelPos.

     */

    public CellLayout getCellLayout(int container, int screenId) {

        return (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)

src/com/android/launcher3/folder/LauncherDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class LauncherDelegate { 
                        // Move the item from the folder to the workspace, in the position of the

                        // folder

                        CellLayout cellLayout = mLauncher.getCellLayout(info.container,

                                info.screenId);

                                mLauncher.getCellPosMapper().mapModelToPresenter(info).screenId);

                        if (cellLayout == null) {

                            return;

                        }