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

Commit 16615f29 authored by Winson's avatar Winson
Browse files

Adding workaround for regression caused by ag/752175 

Change-Id: I92617c88f17a5827454e147f93d822975587d5b4
parent a79b18ad

src/com/android/launcher3/Launcher.java

+2 −2
Original line number Diff line number Diff line
@@ -1857,6 +1857,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.
@@ -1910,8 +1912,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() {