commit | be74d369d47413acffccbc444d4ce303462f3534 | [log] [tgz] |
---|---|---|
author | Pierre Barbier de Reuille <pbdr@google.com> | Thu May 20 20:13:42 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 20 20:13:42 2021 +0000 |
tree | 60e2e5ce8706914fd472641beddfde717c1efc37 | |
parent | dfa29582acabd581149ebff743ddad0075e9d79c [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: I6f82736a53cad4c82a1beb7f896cd46cc4f56895
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()) {