Merge "Fix NPE when launching fullscreen app during split screen mode" into tm-qpr-dev
This commit is contained in:
@@ -1718,8 +1718,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
|
|||||||
logExitToStage(dismissReason, toStage == STAGE_TYPE_MAIN);
|
logExitToStage(dismissReason, toStage == STAGE_TYPE_MAIN);
|
||||||
}
|
}
|
||||||
|
|
||||||
addDividerBarToTransition(info, t, false /* show */);
|
|
||||||
|
|
||||||
// Hide divider and dim layer on transition finished.
|
// Hide divider and dim layer on transition finished.
|
||||||
setDividerVisibility(false, finishT);
|
setDividerVisibility(false, finishT);
|
||||||
finishT.hide(mMainStage.mDimLayer);
|
finishT.hide(mMainStage.mDimLayer);
|
||||||
@@ -1741,6 +1739,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addDividerBarToTransition(info, t, false /* show */);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user