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

Commit 8a18bc0f authored by fbaron's avatar fbaron Committed by Android Build Coastguard Worker
Browse files

Fix inability to remove or interact with folder when removing 2nd item from folder 

Fix: 289960317
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon out of folder lets you open the app that remains where the folder was
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon into remove droptarget removes the folder and turns it into a single clickable icon
flag: no flag
(cherry picked from commit 5a7ea306)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:326ec97ab6a4d348708830cd2860d4dd90a59039)
Merged-In: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
Change-Id: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
parent 16d8dff2

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;

                        }