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

Commit 1b247d9f authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Adding workaround for regression caused by ag/752175" into ub-launcher3-burnaby

parents 8b0af4c6 16615f29

src/com/android/launcher3/Launcher.java

+2 −2
Original line number Diff line number Diff line
@@ -1865,6 +1865,8 @@ public class Launcher extends Activity 
        boolean alreadyOnHome = mHasFocus && ((intent.getFlags() &

                Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)

                != Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);

        boolean moveToDefaultScreen = mLauncherCallbacks != null ?

                mLauncherCallbacks.shouldMoveToDefaultScreenOnHomeIntent() : true;

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

        if (isActionMain) {

            // also will cancel mWaitingForResult.
@@ -1918,8 +1920,6 @@ 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 ?

                    mLauncherCallbacks.shouldMoveToDefaultScreenOnHomeIntent() : true;

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

                    openFolder == null && moveToDefaultScreen) {

                mWorkspace.post(new Runnable() {