diff options
Diffstat (limited to 'quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java')
-rw-r--r-- | quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java index 2a355848b5..f2643641e0 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java @@ -68,6 +68,7 @@ import java.util.HashMap; */ public class DeviceLockedInputConsumer implements InputConsumer, RecentsAnimationCallbacks.RecentsAnimationListener, BuilderProxy { + private final String TAG = "DeviceLockedInputConsumer"; private static final String[] STATE_NAMES = DEBUG_STATES ? new String[2] : null; private static int getFlagForIndex(int index, String name) { @@ -207,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); @@ -217,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); - mHomeLaunched = true; } mStateCallback.setState(STATE_HANDLER_INVALIDATED); } |