commit | 7760f88d8af6c8e59f9ec6c0aacc20b4f0d3b9f4 | [log] [tgz] |
---|---|---|
author | Pierre Barbier de Reuille <pbdr@google.com> | Thu May 20 20:15:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 20 20:15:38 2021 +0000 |
tree | 69dcf6355dae97c85514599d81433c8bd7380f15 | |
parent | e68082e32656270b51cc6d699887c46ad35da630 [diff] | |
parent | c3e6383690c1681bf3943e7b8971a4299f686a05 [diff] |
Merge "Correct QuickStep interaction handler." into sc-dev am: c3e6383690 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14664199 Change-Id: I5bcf01d2423cc887642b57e65cca40210d060c78
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()) {