Merge "Revert "Only add divider when it need to show"" into rvc-dev
This commit is contained in:
@@ -41,6 +41,7 @@ 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;
|
||||||
|
|||||||
@@ -238,11 +238,8 @@ 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() {
|
||||||
return mHandler;
|
return mHandler;
|
||||||
@@ -316,6 +313,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) {
|
||||||
|
|||||||
@@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user