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

Commit a5af8b42 authored by Treehugger Robot's avatar Treehugger Robot 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-qpr-dev
parents cf6b71a1 5a7ea306

src/com/android/launcher3/Launcher.java

+2 −0
Original line number Diff line number Diff line
@@ -2200,6 +2200,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;

                        }