| commit | a246eabe729b12b743d11732e677a9e5526feb62 | [log] [tgz] |
|---|---|---|
| author | Pierre Barbier de Reuille <pbdr@google.com> | Thu May 20 20:44:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 20 20:44:18 2021 +0000 |
| tree | 17d53ec2200aa1ba5a8b4fd823455c7903b54381 | |
| parent | 685cdcc443651da76afa0cc1d9b446e1a867ba42 [diff] | |
| parent | 12d357ed94074f063a09ab336b5209b856006c4e [diff] |
Merge "Correct QuickStep interaction handler." into sc-dev am: c3e6383690 am: 7760f88d8a am: 12d357ed94 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14664199 Change-Id: If57bbad6bd7d06fb67eeae9c0ac2843762c27f6a
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java index 3a8de3c..1304033 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java
@@ -51,7 +51,7 @@ return RemoteViews.startPendingIntent(hostView, pendingIntent, remoteResponse.getLaunchOptions(view)); } - Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(hostView); + Pair<Intent, ActivityOptions> options = remoteResponse.getLaunchOptions(view); ActivityOptionsWrapper activityOptions = mLauncher.getAppTransitionManager() .getActivityLaunchOptions(mLauncher, hostView); if (Utilities.ATLEAST_S && !pendingIntent.isActivity()) {