Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix split cannot active

Browse Source 
It was mistake on previos change, we should exit split when both
stages are invisible.

Bug: 199369390
Test: manual
Test: pass existing tests
Change-Id: I9f237155fd75b4ee16db647f4849f929cbba1056
This commit is contained in:
Tony Huang
2021-09-16 17:14:07 +08:00
parent d2f034f1d5
commit d0c4ac7948
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
View File

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