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

Commit 7bb7ead9 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Fixing the newIntent logic to check the state before it has been... 

Merge "Fixing the newIntent logic to check the state before it has been reset." into ub-launcher3-calgary-polish
parents 9311387a 85313735

src/com/android/launcher3/Launcher.java

+8 −5
Original line number Diff line number Diff line
@@ -1816,11 +1816,14 @@ public class Launcher extends Activity 
        }

        super.onNewIntent(intent);



        // Close the menu

        Folder openFolder = mWorkspace.getOpenFolder();

        boolean alreadyOnHome = mHasFocus && ((intent.getFlags() &

                Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)

                != Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);



        // Check this condition before handling isActionMain, as this will get reset.

        boolean shouldMoveToDefaultScreen = alreadyOnHome &&

                mState == State.WORKSPACE && getTopFloatingView() == null;



        boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());

        if (isActionMain) {

            // also will cancel mWaitingForResult.
@@ -1875,10 +1878,10 @@ public class Launcher extends Activity 
        // as slow logic in the callbacks eat into the time the scroller expects for the snapToPage

        // animation.

        if (isActionMain) {

            boolean moveToDefaultScreen = mLauncherCallbacks != null ?

            boolean callbackAllowsMoveToDefaultScreen = mLauncherCallbacks != null ?

                    mLauncherCallbacks.shouldMoveToDefaultScreenOnHomeIntent() : true;

            if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive() &&

                    openFolder == null && moveToDefaultScreen) {

            if (shouldMoveToDefaultScreen && !mWorkspace.isTouchActive()

                    && callbackAllowsMoveToDefaultScreen) {



                // We use this flag to suppress noisy callbacks above custom content state

                // from onResume.