commit 8013843fbda189cfbe2e15d85b21e0663befe6d6
author Matthew Ng <ngmatthew@google.com> Mon Apr 09 15:05:59 2018 -0700
committer Matthew Ng <ngmatthew@google.com> Mon Apr 30 15:01:32 2018 -0700
tree 9400daf26909da27acd7be28569d39289c47a447
parent 1ea6d9cb8ee4f0784fb441f8923ca3d7f3a1bf78

Secondary split screen app will be next to the navigation bar (2/2)

Refactored docked position code into PhoneWindowManager to determine
which side the docked app should go based on the position of the nav bar
in landscape (as portrait will only have top). Fixed the split screen
entrance animation for quick step's overview.

Change-Id: I0035214cecb9c6403c59f4b938c2d1ae924f34b0
Fixes: 73250406
Test: play around with splitscreen and minimized mode

quickstep/libs/sysui_shared.jar

diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar
index 13f41ee..70e545f 100644
--- a/quickstep/libs/sysui_shared.jar
+++ b/quickstep/libs/sysui_shared.jar
Binary files differ

quickstep/src/com/android/quickstep/TaskSystemShortcut.java

diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
index 7c69a8d..6fece31 100644
--- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
@@ -153,8 +153,13 @@
                 AbstractFloatingView.closeOpenViews(activity, true,
                         AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);
 
+                final int navBarPosition = WindowManagerWrapper.getInstance().getNavBarPosition();
+                if (navBarPosition == WindowManagerWrapper.NAV_BAR_POS_INVALID) {
+                    return;
+                }
+                boolean dockTopOrLeft = navBarPosition != WindowManagerWrapper.NAV_BAR_POS_LEFT;
                 if (ActivityManagerWrapper.getInstance().startActivityFromRecents(taskId,
-                        ActivityOptionsCompat.makeSplitScreenOptions(true))) {
+                        ActivityOptionsCompat.makeSplitScreenOptions(dockTopOrLeft))) {
                     ISystemUiProxy sysUiProxy = RecentsModel.getInstance(activity).getSystemUiProxy();
                     try {
                         sysUiProxy.onSplitScreenInvoked();