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

Commit 85313735 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

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

When home button is pressed, we reset all active state (close all-apps,
folder, shortcuts menu). But we do not go to the default screen if the
active state was non-zero (any of the containers were open).

Change-Id: Ia9a06729d65767124471c5b793323a55d822210a
parent 1b7e9bc0

src/com/android/launcher3/Launcher.java

+8 −5
Original line number Diff line number Diff line
@@ -1793,11 +1793,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.
@@ -1852,10 +1855,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.