Fix split cannot active am: d0c4ac7948 am: 4a7e17f60e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15842432

Change-Id: I49a4ca3361066f7cbae9058305d8a9c3e15399d3
This commit is contained in:
Tony Huang
2021-09-17 20:56:37 +00:00
committed by Automerger Merge Worker

View File

@@ -649,6 +649,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
final boolean sideStageVisible = mSideStageListener.mVisible;
final boolean mainStageVisible = mMainStageListener.mVisible;
final boolean bothStageVisible = sideStageVisible && mainStageVisible;
final boolean bothStageInvisible = !sideStageVisible && !mainStageVisible;
final boolean sameVisibility = sideStageVisible == mainStageVisible;
// Only add or remove divider when both visible or both invisible to avoid sometimes we only
// got one stage visibility changed for a moment and it will cause flicker.
@@ -656,7 +657,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
setDividerVisibility(bothStageVisible);
}
if (!bothStageVisible) {
if (bothStageInvisible) {
if (mExitSplitScreenOnHide
// Don't dismiss staged split when both stages are not visible due to sleeping display,
// like the cases keyguard showing or screen off.