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

Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e947

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

Change-Id: Ia79d872a4cec311280b17e8c03ad983b70de885a
This commit is contained in:
TreeHugger Robot
2020-06-15 08:14:01 +00:00
committed by Automerger Merge Worker
parent 4d8763d941 c944f5e947
commit 6f66eb5707
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,9 +253,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
mSplitLayout.mSecondary = new Rect(mRotateSplitLayout.mSecondary); mSplitLayout.mSecondary = new Rect(mRotateSplitLayout.mSecondary);
mRotateSplitLayout = null; mRotateSplitLayout = null;
} }
if (isSplitActive()) { update(newConfig);
update(newConfig);
}
} }
Handler getHandler() { Handler getHandler() {
@@ -330,6 +328,11 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
mHandler.post(this::removeDivider); mHandler.post(this::removeDivider);
} }
void onTasksReady() {
mHandler.post(() -> update(mDisplayController.getDisplayContext(
mContext.getDisplayId()).getResources().getConfiguration()));
}
private void updateVisibility(final boolean visible) { private void updateVisibility(final boolean visible) {
if (DEBUG) Slog.d(TAG, "Updating visibility " + mVisible + "->" + visible); if (DEBUG) Slog.d(TAG, "Updating visibility " + mVisible + "->" + visible);
if (mVisible != visible) { if (mVisible != visible) {
@@ -521,7 +524,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
void ensureMinimizedSplit() { void ensureMinimizedSplit() {
setHomeMinimized(true /* minimized */, mSplits.mSecondary.isResizable()); setHomeMinimized(true /* minimized */, mSplits.mSecondary.isResizable());
if (mView != null && !isDividerVisible()) { if (!isDividerVisible()) {
// Wasn't in split-mode yet, so enter now. // Wasn't in split-mode yet, so enter now.
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, " entering split mode with minimized=true"); Slog.d(TAG, " entering split mode with minimized=true");
@@ -532,7 +535,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
void ensureNormalSplit() { void ensureNormalSplit() {
setHomeMinimized(false /* minimized */, mHomeStackResizable); setHomeMinimized(false /* minimized */, mHomeStackResizable);
if (mView != null && !isDividerVisible()) { if (!isDividerVisible()) {
// Wasn't in split-mode, so enter now. // Wasn't in split-mode, so enter now.
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, " enter split mode unminimized "); Slog.d(TAG, " enter split mode unminimized ");

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

@@ -113,6 +113,8 @@ class SplitScreenTaskOrganizer extends TaskOrganizer {
t.setColor(mSecondaryDim, new float[]{0f, 0f, 0f}); t.setColor(mSecondaryDim, new float[]{0f, 0f, 0f});
t.apply(); t.apply();
releaseTransaction(t); releaseTransaction(t);
mDivider.onTasksReady();
} }
} }
} }