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

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

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

Change-Id: I2274b246c949846a48d622090c17be3d0baed4b3
This commit is contained in:
Tony Huang
2020-06-12 03:24:57 +00:00
committed by Automerger Merge Worker
parent ea43b62474 a73d6ecb84
commit dbe759768c
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/view/WindowlessWindowManager.java
View File

@@ -41,7 +41,6 @@ public class WindowlessWindowManager implements IWindowSession {
private final static String TAG = "WindowlessWindowManager"; private final static String TAG = "WindowlessWindowManager";
private class State { private class State {
//TODO : b/150190730 we should create it when view show and release it when view invisible.
SurfaceControl mSurfaceControl; SurfaceControl mSurfaceControl;
WindowManager.LayoutParams mParams = new WindowManager.LayoutParams(); WindowManager.LayoutParams mParams = new WindowManager.LayoutParams();
int mDisplayId; int mDisplayId;

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

@@ -253,7 +253,9 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
mSplitLayout.mSecondary = new Rect(mRotateSplitLayout.mSecondary); mSplitLayout.mSecondary = new Rect(mRotateSplitLayout.mSecondary);
mRotateSplitLayout = null; mRotateSplitLayout = null;
} }
update(newConfig); if (isSplitActive()) {
update(newConfig);
}
} }
Handler getHandler() { Handler getHandler() {
@@ -328,11 +330,6 @@ 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) {
@@ -524,7 +521,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 (!isDividerVisible()) { if (mView != null && !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");
@@ -535,7 +532,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
void ensureNormalSplit() { void ensureNormalSplit() {
setHomeMinimized(false /* minimized */, mHomeStackResizable); setHomeMinimized(false /* minimized */, mHomeStackResizable);
if (!isDividerVisible()) { if (mView != null && !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,8 +113,6 @@ 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();
} }
} }
} }