summaryrefslogtreecommitdiffstats
path: root/quickstep
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2019-05-17 14:45:34 -0700
committerWinson Chung <winsonc@google.com>2019-05-17 14:45:34 -0700
commit5aec768ff4bd7fcdc043346485ab6b1c512d95b4 (patch)
treea74869a8c61a73f8cdb00e00e682bebe2b15d73f /quickstep
parent62f53ddafbb7c139140dd3a80b0f6e9443d0ddfe (diff)
downloadandroid_packages_apps_Trebuchet-5aec768ff4bd7fcdc043346485ab6b1c512d95b4.tar.gz
android_packages_apps_Trebuchet-5aec768ff4bd7fcdc043346485ab6b1c512d95b4.tar.bz2
android_packages_apps_Trebuchet-5aec768ff4bd7fcdc043346485ab6b1c512d95b4.zip
Fix issue with restored task display ids
- When tasks are restored, they don't have a valid display id yet, but they will still be started on the default display and should have the same options until proven otherwise. Bug: 132892578 Change-Id: I8ba0a976bd5682fbcda72ca1a98bf2517eb31312
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java2
1 files changed, 1 insertions, 1 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 2c919b3c1..213c5d324 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
@@ -226,7 +226,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
// TODO(b/118266305): Temporarily disable splitscreen for secondary display while new
// implementation is enabled
return !activity.getDeviceProfile().isMultiWindowMode
- && displayId == DEFAULT_DISPLAY;
+ && (displayId == -1 || displayId == DEFAULT_DISPLAY);
}
@Override