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

Commit e126440f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24056558'] into udc-release.

Change-Id: Ibee4cd36f6f40b94108e3bfeec99afd25265f4cd
parents 16d8dff2 faf861aa
Loading
Loading
Loading
Loading
+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)
+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;
                        }