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