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

Commit 15f8b17a authored by Winson's avatar Winson
Browse files

Deferring the move to the default screen until after we callback to the callbacks. 

- Since move to default screen starts the scroller immediately, any delays in
  handling onNewIntent and onHomeIntent in the callbacks will cause the scroller
  to skip frames the next time it updates.  This change will defer updating the
  page to the default screen until after onNewIntent is called back (and all its
  posted runnables).

Bug: 22929080
Change-Id: Ibab6106938721702d4da23faaca99039861e10dc
parent 81056da1

src/com/android/launcher3/Launcher.java

+27 −17
Original line number Diff line number Diff line
@@ -1867,29 +1867,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();
@@ -1923,13 +1916,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