commit 6206463d94734ce1d15ab362682f66265bec37fd
author Tracy Zhou <tracyzhou@google.com> Fri Apr 08 16:05:21 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 08 16:05:21 2022 +0000
tree a9f6c59345fb1c48d474d1b18f4dd3ed74546ccb
parent 23b026f6a07687ae4da30c31d471bfaef54bee3e
parent 37d9c87f7deb9bb3f53c1098ac60e00e762fa4e2

Merge changes from topic "presubmit-am-2eb27cabdda4410b8ead207e2f7f1d78" into tm-mainline-prod

* changes:
  [automerge] Set finishedToApp = false when rotating in Overview 2p: 655627f70b
  Set finishedToApp = false when rotating in Overview

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
index 235a156..eed67b6 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -444,7 +444,8 @@
 
         @Override
         public void onRecentsAnimationCanceled(HashMap<Integer, ThumbnailData> thumbnailDatas) {
-            endGestureStateOverride(true);
+            boolean isInOverview = mLauncher.isInState(LauncherState.OVERVIEW);
+            endGestureStateOverride(!isInOverview);
         }
 
         @Override