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

Commit 4c40be97 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes the issue Launcher state propagation is slower than... 

Merge "Fixes the issue Launcher state propagation is slower than onDeferredResume." into ub-launcher3-master
parents a3fff659 3bf889a0

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+6 −0
Original line number Diff line number Diff line
@@ -157,6 +157,12 @@ public abstract class BaseQuickstepLauncher extends Launcher 
    @Override

    protected void onDeferredResumed() {

        super.onDeferredResumed();

        handlePendingActivityRequest();

    }



    @Override

    protected void handlePendingActivityRequest() {

        super.handlePendingActivityRequest();

        if (mPendingActivityRequestCode != -1 && isInState(NORMAL)) {

            // Remove any active ProxyActivityStarter task and send RESULT_CANCELED to Launcher.

            onActivityResult(mPendingActivityRequestCode, RESULT_CANCELED, null);

src/com/android/launcher3/Launcher.java

+3 −1
Original line number Diff line number Diff line
@@ -923,6 +923,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
        DiscoveryBounce.showForHomeIfNeeded(this);

    }



    protected void handlePendingActivityRequest() { }



    private void logStopAndResume(int command) {

        int pageIndex = mWorkspace.isOverlayShown() ? -1 : mWorkspace.getCurrentPage();
@@ -1423,7 +1424,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
                if (!isInState(NORMAL)) {

                    // Only change state, if not already the same. This prevents cancelling any

                    // animations running as part of resume

                    mStateManager.goToState(NORMAL);

                    mStateManager.goToState(NORMAL, mStateManager.shouldAnimateStateChange(),

                            this::handlePendingActivityRequest);

                }



                // Reset the apps view