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

Merge "Reset Divider#mMinimized when dismiss split" into rvc-dev am: 9e747a5508 am: 6e97b1fd8a

Browse Source 
Change-Id: I5f1fd67e3d66d81f2b49ab68d753e9b5743474be
This commit is contained in:
Louis Chang
2020-05-05 08:31:10 +00:00
committed by Automerger Merge Worker
parent e94e648e84 6e97b1fd8a
commit c669aa3c70
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
View File

@@ -634,6 +634,11 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
} }
} }
void onSplitDismissed() {
mMinimized = false;
updateVisibility(false /* visible */);
}
/** Switch to minimized state if appropriate */ /** Switch to minimized state if appropriate */
public void setMinimized(final boolean minimized) { public void setMinimized(final boolean minimized) {
if (DEBUG) Slog.d(TAG, "posting ext setMinimized " + minimized + " vis:" + mVisible); if (DEBUG) Slog.d(TAG, "posting ext setMinimized " + minimized + " vis:" + mVisible);

2
packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
View File

@@ -201,7 +201,7 @@ class SplitScreenTaskOrganizer extends TaskOrganizer {
+ mPrimary.topActivityType + " " + mSecondary.topActivityType); + mPrimary.topActivityType + " " + mSecondary.topActivityType);
} }
WindowManagerProxy.applyDismissSplit(this, true /* dismissOrMaximize */); WindowManagerProxy.applyDismissSplit(this, true /* dismissOrMaximize */);
mDivider.updateVisibility(false /* visible */); mDivider.onSplitDismissed();
} else if (!primaryIsEmpty && primaryWasEmpty && secondaryWasEmpty) { } else if (!primaryIsEmpty && primaryWasEmpty && secondaryWasEmpty) {
// Wasn't in split-mode (both were empty), but now that the primary split is // Wasn't in split-mode (both were empty), but now that the primary split is
// populated, we should fully enter split by moving everything else into secondary. // populated, we should fully enter split by moving everything else into secondary.