summaryrefslogtreecommitdiff
path: root/quickstep/src
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2022-03-08 16:37:35 -0800
committerJon Miranda <jonmiranda@google.com>2022-03-08 16:37:35 -0800
commitb42e124f5b189eb28d7dd2694ef6dab77985aa07 (patch)
tree277935151e0ee71c2df487fb3a9f51e84635eb9f /quickstep/src
parentf4f6be6080e4f9f679b49f839749ab0b23803a32 (diff)
downloadLauncher3-b42e124f5b189eb28d7dd2694ef6dab77985aa07.tar.gz
Never look for matching view in All Apps when swiping up to go home.
The swiping up gesture will never return an app in All Apps, so we can ignore All Apps state in those cases. This fixes an edge case where user swipes up and launcher state is still in All Apps. This causes us to animate the icon to where it would be in All Apps, even though by the time the animation starts we are actually in Normal state. Bug: 222124240 Test: open app from all apps then quickly swipe up to go home Change-Id: I756a870660a397d6629aec82e4f5ec4914ed0669
Diffstat (limited to 'quickstep/src')
-rw-r--r--quickstep/src/com/android/launcher3/QuickstepTransitionManager.java4
-rw-r--r--quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java3
2 files changed, 4 insertions, 3 deletions
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index c4a3fb5572..8644a1238f 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1288,8 +1288,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
}
}
- return mLauncher.getFirstMatchForAppClose(launchCookieItemId,
- packageName, UserHandle.of(runningTaskTarget.taskInfo.userId));
+ return mLauncher.getFirstMatchForAppClose(launchCookieItemId, packageName,
+ UserHandle.of(runningTaskTarget.taskInfo.userId), true /* supportsAllAppsState */);
}
private @NonNull RectF getDefaultWindowTargetRect() {
diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
index af6cb847db..bc7a6ae449 100644
--- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
+++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java
@@ -233,7 +233,8 @@ public class LauncherSwipeHandlerV2 extends
return mActivity.getFirstMatchForAppClose(launchCookieItemId,
runningTaskView.getTask().key.getComponent().getPackageName(),
- UserHandle.of(runningTaskView.getTask().key.userId));
+ UserHandle.of(runningTaskView.getTask().key.userId),
+ false /* supportsAllAppsState */);
}
@Override