diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-08-05 17:39:42 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-05 17:39:42 -0700 |
commit | 12179199816b6205a788e31ac8d38b96d6de53ad (patch) | |
tree | 944c678d9b7bbdd0e4b73e4c37a9f260bc5817df /quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java | |
parent | 347ce4529b5b7f682aa9f4959b17f2b52176ae67 (diff) | |
parent | bafd62971ab6d1a2c15c1baba21ea78074837368 (diff) | |
download | android_packages_apps_Trebuchet-12179199816b6205a788e31ac8d38b96d6de53ad.tar.gz android_packages_apps_Trebuchet-12179199816b6205a788e31ac8d38b96d6de53ad.tar.bz2 android_packages_apps_Trebuchet-12179199816b6205a788e31ac8d38b96d6de53ad.zip |
Merge "Use task display id when starting split screen" into ub-launcher3-qt-r1-dev am: 6cf32a2e95
am: bafd62971a
Change-Id: I1b981e07329a0a6fc0667af58188c9ba047f068d
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java index cfd14bb29..1af0db07d 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java @@ -205,8 +205,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut } }; WindowManagerWrapper.getInstance().overridePendingAppTransitionMultiThumbFuture( - future, animStartedListener, mHandler, true /* scaleUp */, - v.getDisplay().getDisplayId()); + future, animStartedListener, mHandler, true /* scaleUp */, displayId); } }); } |