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: 8013843fbd
  Secondary split screen app will be next to the navigation bar (2/2)
This commit is contained in:
android-build-team Robot
2018-05-01 00:40:27 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 1 deletions
Binary file not shown.
@@ -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();