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

Commit 6b558e4a authored by Robin Lee's avatar Robin Lee
Browse files

Exit Recents with HOME instead of WCT when locked 

We need to merge the next incoming transition (KEYGUARD_UNOCCLUDING) to
get a smooth transition. Sending a WCT at the end makes merging the
two transitions together difficult because the WCT is missing and may
even generate a third transition afterwards if the end result doesn't
match.

Bug: 293862576
Change-Id: Ifd19f0d445ffe21f3bb068882321a55091377173
parent 0ddc9843

quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java

+6 −6
Original line number Diff line number Diff line
@@ -208,7 +208,12 @@ public class DeviceLockedInputConsumer implements InputConsumer, 
            animator.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {

                    if (ENABLE_SHELL_TRANSITIONS) {

                    if (dismissTask) {

                        // Just start the home intent so the user is prompted to unlock the device.

                        // This will come back and cancel the interaction.

                        startHomeIntentSafely(mContext, mGestureState.getHomeIntent(), null, TAG);

                        mHomeLaunched = true;

                    } else if (ENABLE_SHELL_TRANSITIONS) {

                        if (mTaskAnimationManager.getCurrentCallbacks() != null) {

                            if (mRecentsAnimationController != null) {

                                finishRecentsAnimationForShell(dismissTask);
@@ -218,11 +223,6 @@ public class DeviceLockedInputConsumer implements InputConsumer, 
                                mDismissTask = dismissTask;

                            }

                        }

                    } else if (dismissTask) {

                        // For now, just start the home intent so user is prompted to

                        // unlock the device.

                        startHomeIntentSafely(mContext, mGestureState.getHomeIntent(), null, TAG);

                        mHomeLaunched = true;

                    }

                    mStateCallback.setState(STATE_HANDLER_INVALIDATED);

                }