Merge "Exit Recents with HOME instead of WCT when locked" into main (b0ed620d) · Commits · e / os / android_packages_apps_Trebuchet

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);
		}