| commit | 57ffdc4ec75a92c26d7f8807a63325ac71433cf2 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 17 22:10:02 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 17 22:10:02 2019 +0000 |
| tree | f8dce9c03fc1bcda95b68b34e7bfaf0a83015f01 | |
| parent | d3b0e8ed6131b4d66166c380e6e8b225c37391a5 [diff] | |
| parent | 5aec768ff4bd7fcdc043346485ab6b1c512d95b4 [diff] |
Merge "Fix issue with restored task display ids" into ub-launcher3-qt-dev
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 2c919b3..213c5d3 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 @@ // 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