Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f98e2df authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "right-split-screen" into ub-launcher3-master

* changes:
  [automerger] Secondary split screen app will be next to the navigation bar (2/2) am: 8013843f
  Secondary split screen app will be next to the navigation bar (2/2)
parents d4cc439b 050b4f85
Loading
Loading
Loading
Loading
+823 B (121 KiB)

File changed.

No diff preview for this file type.

+6 −1
Original line number Diff line number Diff line
@@ -153,8 +153,13 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
                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();