summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-08-06 00:21:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-06 00:21:01 +0000
commit6cf32a2e954bd6d23d27371a896aef16b5534cd0 (patch)
tree0c50e3d96f0c665bd18480fb97ab584172501107
parent290a9a814a5b0ab0a1ab49cd268e29a79aec252e (diff)
parent1eade2f947cae931c2acc73b980b89ca77c7fe5d (diff)
downloadandroid_packages_apps_Trebuchet-6cf32a2e954bd6d23d27371a896aef16b5534cd0.tar.gz
android_packages_apps_Trebuchet-6cf32a2e954bd6d23d27371a896aef16b5534cd0.tar.bz2
android_packages_apps_Trebuchet-6cf32a2e954bd6d23d27371a896aef16b5534cd0.zip
Merge "Use task display id when starting split screen" into ub-launcher3-qt-r1-dev
-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);
}
});
}