summaryrefslogtreecommitdiffstats
path: root/quickstep
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2019-08-05 17:33:42 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-08-05 17:33:42 -0700
commitbafd62971ab6d1a2c15c1baba21ea78074837368 (patch)
tree8ec877eff621616bbc839b0ffdb24daf4d2d182b /quickstep
parentf4a1814c3f3c0390e717d3945d1d32e0ccfb1d6c (diff)
parent6cf32a2e954bd6d23d27371a896aef16b5534cd0 (diff)
downloadandroid_packages_apps_Trebuchet-bafd62971ab6d1a2c15c1baba21ea78074837368.tar.gz
android_packages_apps_Trebuchet-bafd62971ab6d1a2c15c1baba21ea78074837368.tar.bz2
android_packages_apps_Trebuchet-bafd62971ab6d1a2c15c1baba21ea78074837368.zip
Merge "Use task display id when starting split screen" into ub-launcher3-qt-r1-dev
am: 6cf32a2e95 Change-Id: I7313eb81291d3fbe353882446d7da39bba355ec9
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java3
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 213c5d324..fd4592307 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
@@ -207,8 +207,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);
}
});
}