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

Commit cb20616a authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually... 

am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop

* commit 'd8f6253e':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank
parents 6317598a d8f6253e

src/com/android/launcher3/Launcher.java

+12 −2
Original line number Diff line number Diff line
@@ -721,8 +721,13 @@ public class Launcher extends Activity 
     * a configuration step, this allows the proper animations to run after other transitions.

     */

    private long completeAdd(PendingAddArguments args) {

        long screenId = args.screenId;

        if (args.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {

            // When the screen id represents an actual screen (as opposed to a rank) we make sure

            // that the drop page actually exists.

            screenId = ensurePendingDropLayoutExists(args.screenId);

        }



        long screenId = ensurePendingDropLayoutExists(args.screenId);

        switch (args.requestCode) {

            case REQUEST_CREATE_SHORTCUT:

                completeAddShortcut(args.intent, args.container, screenId, args.cellX,
@@ -814,7 +819,12 @@ public class Launcher extends Activity 
                }

            } else {

                if (!workspaceLocked) {

                    mPendingAddInfo.screenId = ensurePendingDropLayoutExists(mPendingAddInfo.screenId);

                    if (mPendingAddInfo.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {

                        // When the screen id represents an actual screen (as opposed to a rank)

                        // we make sure that the drop page actually exists.

                        mPendingAddInfo.screenId =

                                ensurePendingDropLayoutExists(mPendingAddInfo.screenId);

                    }

                    final CellLayout dropLayout = mWorkspace.getScreenWithId(mPendingAddInfo.screenId);



                    dropLayout.setDropPending(true);