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

Commit 177b7150 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Attempt to preload the Launcher activity when the user reaches the All... 

Merge "Attempt to preload the Launcher activity when the user reaches the All Set Page." into tm-dev am: 9557b10c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18400686



Change-Id: Id9d10958bd8f6e77368199ee3163aa350224ea05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13dd1391 9557b10c

quickstep/src/com/android/quickstep/TouchInteractionService.java

+16 −1
Original line number Diff line number Diff line
@@ -264,6 +264,16 @@ public class TouchInteractionService extends Service 
            MAIN_EXECUTOR.execute(ProxyScreenStatusProvider.INSTANCE::onScreenTurnedOn);

        }



        /**

         * Preloads the Overview activity.

         *

         * This method should only be used when the All Set page of the SUW is reached to safely

         * preload the Launcher for the SUW first reveal.

         */

        public void preloadOverviewForSUWAllSet() {

            preloadOverview(false, true);

        }



        @Override

        public void onRotationProposal(int rotation, boolean isValid) {

            executeForTaskbarManager(() -> mTaskbarManager.onRotationProposal(rotation, isValid));
@@ -865,6 +875,10 @@ public class TouchInteractionService extends Service 
    }



    private void preloadOverview(boolean fromInit) {

        preloadOverview(fromInit, false);

    }



    private void preloadOverview(boolean fromInit, boolean forSUWAllSet) {

        if (!mDeviceState.isUserUnlocked()) {

            return;

        }
@@ -874,7 +888,8 @@ public class TouchInteractionService extends Service 
            return;

        }



        if (RestoreDbTask.isPending(this) || !mDeviceState.isUserSetupComplete()) {

        if ((RestoreDbTask.isPending(this) && !forSUWAllSet)

                || !mDeviceState.isUserSetupComplete()) {

            // Preloading while a restore is pending may cause launcher to start the restore

            // too early.

            return;

quickstep/src/com/android/quickstep/interaction/AllSetActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ public class AllSetActivity extends Activity { 
        mBinder = binder;

        mBinder.getTaskbarManager().setSetupUIVisible(isResumed());

        mBinder.setSwipeUpProxy(isResumed() ? this::createSwipeUpProxy : null);

        mBinder.preloadOverviewForSUWAllSet();

    }



    @Override