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

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

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

Merge "Secondary split screen app will be next to the navigation bar (2/2)" into ub-launcher3-edmonton
parents 1e0b98fa 8013843f

quickstep/libs/sysui_shared.jar

+823 B (121 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

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

+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();