summaryrefslogtreecommitdiff
path: root/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2021-06-22 18:20:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-22 18:20:46 +0000
commit9ffb0f803bc39e0178b391ad42daa1df0149f92c (patch)
tree636428d5b1d1c1deb927bbe7c7e5d9a6b16c83fd /quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
parentb64e0674501fb5bcfce01895e1625b9b0de1224d (diff)
parenteb3367796a15778a72e888cc0b57e2281f949f64 (diff)
Merge "Fixing TaskView.launchTask.onEndCallback is not called" into sc-dev am: eb3367796a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15032513 Change-Id: I0b76512550814f23fde9c95a59e90e50280e3dde
Diffstat (limited to 'quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java')
-rw-r--r--quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 4eb2d53b46..ef96c963bd 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -423,7 +423,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
public ActivityOptionsWrapper getActivityLaunchOptions(View v, @Nullable ItemInfo item) {
ActivityOptionsWrapper activityOptions =
mAppTransitionManager.hasControlRemoteAppTransitionPermission()
- ? mAppTransitionManager.getActivityLaunchOptions(this, v)
+ ? mAppTransitionManager.getActivityLaunchOptions(v)
: super.getActivityLaunchOptions(v, item);
if (mLastTouchUpTime > 0) {
ActivityOptionsCompat.setLauncherSourceInfo(