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

Commit 96e03b3e authored by Federico Baron's avatar Federico Baron Committed by Automerger Merge Worker
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 am: 80028976

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558



Change-Id: Iff6b9ec51905ae3c724eed52f3ecedb7a547efeb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents add37239 80028976

src/com/android/launcher3/Launcher.java

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

                        }