[automerger] Secondary split screen app will be next to the navigation bar (2/2) am: 8013843fbd

Change-Id: I90e58b6b3ac874a6b418e3b4918865359e14c4d8
This commit is contained in:
Android Build Merger (Role)
2018-04-30 22:01:45 +00:00
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();