diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index dce377d5d7..29988927bb 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -1009,12 +1009,7 @@ public class TaskbarLauncherStateController { @Override public void onRecentsAnimationFinished(RecentsAnimationController controller) { - endGestureStateOverride(!controller.getFinishTargetIsLauncher(), - controller.getLauncherIsVisibleAtFinish(), false /*canceled*/); - } - - private void endGestureStateOverride(boolean finishedToApp, boolean canceled) { - endGestureStateOverride(finishedToApp, finishedToApp, canceled); + endGestureStateOverride(!controller.getFinishTargetIsLauncher(), false /*canceled*/); } /** @@ -1024,13 +1019,11 @@ public class TaskbarLauncherStateController { * * @param finishedToApp {@code true} if the recents animation finished to showing an app and * not workspace or overview - * @param launcherIsVisible {code true} if launcher is visible at finish * @param canceled {@code true} if the recents animation was canceled instead of * finishing * to completion */ - private void endGestureStateOverride(boolean finishedToApp, boolean launcherIsVisible, - boolean canceled) { + private void endGestureStateOverride(boolean finishedToApp, boolean canceled) { mCallbacks.removeListener(this); mTaskBarRecentsAnimationListener = null; ((RecentsView) mLauncher.getOverviewPanel()).setTaskLaunchListener(null); @@ -1039,27 +1032,18 @@ public class TaskbarLauncherStateController { mSkipNextRecentsAnimEnd = false; return; } - updateStateForUserFinishedToApp(finishedToApp, launcherIsVisible); + updateStateForUserFinishedToApp(finishedToApp); } } - /** - * @see #updateStateForUserFinishedToApp(boolean, boolean) - */ - private void updateStateForUserFinishedToApp(boolean finishedToApp) { - updateStateForUserFinishedToApp(finishedToApp, !finishedToApp); - } - /** * Updates the visible state immediately to ensure a seamless handoff. * * @param finishedToApp True iff user is in an app. - * @param launcherIsVisible True iff launcher is still visible (ie. transparent app) */ - private void updateStateForUserFinishedToApp(boolean finishedToApp, - boolean launcherIsVisible) { + private void updateStateForUserFinishedToApp(boolean finishedToApp) { // Update the visible state immediately to ensure a seamless handoff - boolean launcherVisible = !finishedToApp || launcherIsVisible; + boolean launcherVisible = !finishedToApp; updateStateForFlag(FLAG_TRANSITION_TO_VISIBLE, false); updateStateForFlag(FLAG_VISIBLE, launcherVisible); applyState(); @@ -1068,7 +1052,7 @@ public class TaskbarLauncherStateController { if (DEBUG) { Log.d(TAG, "endGestureStateOverride - FLAG_IN_APP: " + finishedToApp); } - controller.updateStateForFlag(FLAG_IN_APP, finishedToApp && !launcherIsVisible); + controller.updateStateForFlag(FLAG_IN_APP, finishedToApp); controller.applyState(); } diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationController.java b/quickstep/src/com/android/quickstep/RecentsAnimationController.java index 60fcff86f3..dcb01087ee 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationController.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationController.java @@ -53,8 +53,6 @@ public class RecentsAnimationController { private boolean mFinishRequested = false; // Only valid when mFinishRequested == true. private boolean mFinishTargetIsLauncher; - // Only valid when mFinishRequested == true - private boolean mLauncherIsVisibleAtFinish; private RunnableList mPendingFinishCallbacks = new RunnableList(); public RecentsAnimationController(RecentsAnimationControllerCompat controller, @@ -118,28 +116,14 @@ public class RecentsAnimationController { finishController(toRecents, onFinishComplete, sendUserLeaveHint); } - @UiThread - public void finish(boolean toRecents, boolean launcherIsVisibleAtFinish, - Runnable onFinishComplete, boolean sendUserLeaveHint) { - Preconditions.assertUIThread(); - finishController(toRecents, launcherIsVisibleAtFinish, onFinishComplete, sendUserLeaveHint, - false); - } - @UiThread public void finishController(boolean toRecents, Runnable callback, boolean sendUserLeaveHint) { - finishController(toRecents, false, callback, sendUserLeaveHint, false /* forceFinish */); + finishController(toRecents, callback, sendUserLeaveHint, false /* forceFinish */); } @UiThread public void finishController(boolean toRecents, Runnable callback, boolean sendUserLeaveHint, boolean forceFinish) { - finishController(toRecents, toRecents, callback, sendUserLeaveHint, forceFinish); - } - - @UiThread - public void finishController(boolean toRecents, boolean launcherIsVisibleAtFinish, - Runnable callback, boolean sendUserLeaveHint, boolean forceFinish) { mPendingFinishCallbacks.add(callback); if (!forceFinish && mFinishRequested) { // If finish has already been requested, then add the callback to the pending list. @@ -151,7 +135,6 @@ public class RecentsAnimationController { // Finish not yet requested mFinishRequested = true; mFinishTargetIsLauncher = toRecents; - mLauncherIsVisibleAtFinish = launcherIsVisibleAtFinish; mOnFinishedListener.accept(this); Runnable finishCb = () -> { mController.finish(toRecents, sendUserLeaveHint, new IResultReceiver.Stub() { @@ -228,14 +211,6 @@ public class RecentsAnimationController { return mFinishTargetIsLauncher; } - /** - * RecentsAnimationListeners can check this in onRecentsAnimationFinished() to determine whether - * the animation was finished to launcher vs an app. - */ - public boolean getLauncherIsVisibleAtFinish() { - return mLauncherIsVisibleAtFinish; - } - public void dump(String prefix, PrintWriter pw) { pw.println(prefix + "RecentsAnimationController:"); diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 92c93ff9ee..8982850532 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -5854,22 +5854,15 @@ public abstract class RecentsView< * Finish recents animation. */ public void finishRecentsAnimation(boolean toRecents, @Nullable Runnable onFinishComplete) { - finishRecentsAnimation(toRecents, false, true /* shouldPip */, onFinishComplete); + finishRecentsAnimation(toRecents, true /* shouldPip */, onFinishComplete); } - /** - * Finish recents animation. - */ - public void finishRecentsAnimation(boolean toRecents, boolean shouldPip, - @Nullable Runnable onFinishComplete) { - finishRecentsAnimation(toRecents, shouldPip, false, onFinishComplete); - } /** * NOTE: Whatever value gets passed through to the toRecents param may need to also be set on * {@link #mRecentsAnimationController#setWillFinishToHome}. */ public void finishRecentsAnimation(boolean toRecents, boolean shouldPip, - boolean allAppTargetsAreTranslucent, @Nullable Runnable onFinishComplete) { + @Nullable Runnable onFinishComplete) { Log.d(TAG, "finishRecentsAnimation - mRecentsAnimationController: " + mRecentsAnimationController); // TODO(b/197232424#comment#10) Move this back into onRecentsAnimationComplete(). Maybe? @@ -5901,7 +5894,7 @@ public abstract class RecentsView< tx, null /* overlay */); } } - mRecentsAnimationController.finish(toRecents, allAppTargetsAreTranslucent, () -> { + mRecentsAnimationController.finish(toRecents, () -> { if (onFinishComplete != null) { onFinishComplete.run(); }