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

Commit bf4c1d40 authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 1cd32a21: Merge "Deferring the move to the default screen until after we... 

am 1cd32a21: Merge "Deferring the move to the default screen until after we callback to the callbacks." into ub-launcher3-burnaby

* commit '1cd32a21':
  Deferring the move to the default screen until after we callback to the callbacks.
parents 5f195074 1cd32a21

src/com/android/launcher3/Launcher.java

+27 −17
Original line number Diff line number Diff line
@@ -1842,29 +1842,22 @@ public class Launcher extends Activity 
        super.onNewIntent(intent);



        // Close the menu

        if (Intent.ACTION_MAIN.equals(intent.getAction())) {

            // also will cancel mWaitingForResult.

            closeSystemDialogs();



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

        Folder openFolder = mWorkspace.getOpenFolder();

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

                Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)

                != Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);

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

        if (isActionMain) {

            // also will cancel mWaitingForResult.

            closeSystemDialogs();



            if (mWorkspace == null) {

                // Can be cases where mWorkspace is null, this prevents a NPE

                return;

            }

            Folder openFolder = mWorkspace.getOpenFolder();

            // In all these cases, only animate if we're already on home

            mWorkspace.exitWidgetResizeMode();



            boolean moveToDefaultScreen = mLauncherCallbacks != null ?

                    mLauncherCallbacks.shouldMoveToDefaultScreenOnHomeIntent() : true;

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

                    openFolder == null && moveToDefaultScreen) {

                mWorkspace.moveToDefaultScreen(true);

            }



            closeFolder();

            exitSpringLoadedDragMode();
@@ -1898,13 +1891,30 @@ public class Launcher extends Activity 
            }

        }



        if (DEBUG_RESUME_TIME) {

            Log.d(TAG, "Time spent in onNewIntent: " + (System.currentTimeMillis() - startTime));

        }



        if (mLauncherCallbacks != null) {

            mLauncherCallbacks.onNewIntent(intent);

        }



        // Defer moving to the default screen until after we callback to the LauncherCallbacks

        // 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() {

                    @Override

                    public void run() {

                        mWorkspace.moveToDefaultScreen(true);

                    }

                });

            }

        }



        if (DEBUG_RESUME_TIME) {

            Log.d(TAG, "Time spent in onNewIntent: " + (System.currentTimeMillis() - startTime));

        }

    }



    @Override