Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c (8e350afb) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowlessWindowManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ public class WindowlessWindowManager implements IWindowSession {
		private final static String TAG = "WindowlessWindowManager";

		private class State {
		//TODO : b/150190730 we should create it when view show and release it when view invisible.
		SurfaceControl mSurfaceControl;
		WindowManager.LayoutParams mParams = new WindowManager.LayoutParams();
		int mDisplayId;

+5 −8

Original line number	Diff line number	Diff line
		@@ -253,8 +253,10 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
		mSplitLayout.mSecondary = new Rect(mRotateSplitLayout.mSecondary);
		mRotateSplitLayout = null;
		}
		if (isSplitActive()) {
		update(newConfig);
		}
		}

		Handler getHandler() {
		return mHandler;
		@@ -328,11 +330,6 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
		mHandler.post(this::removeDivider);
		}

		void onTasksReady() {
		mHandler.post(() -> update(mDisplayController.getDisplayContext(
		mContext.getDisplayId()).getResources().getConfiguration()));
		}

		private void updateVisibility(final boolean visible) {
		if (DEBUG) Slog.d(TAG, "Updating visibility " + mVisible + "->" + visible);
		if (mVisible != visible) {
		@@ -524,7 +521,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,

		void ensureMinimizedSplit() {
		setHomeMinimized(true /* minimized */, mSplits.mSecondary.isResizable());
		if (!isDividerVisible()) {
		if (mView != null && !isDividerVisible()) {
		// Wasn't in split-mode yet, so enter now.
		if (DEBUG) {
		Slog.d(TAG, " entering split mode with minimized=true");
		@@ -535,7 +532,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,

		void ensureNormalSplit() {
		setHomeMinimized(false /* minimized */, mHomeStackResizable);
		if (!isDividerVisible()) {
		if (mView != null && !isDividerVisible()) {
		// Wasn't in split-mode, so enter now.
		if (DEBUG) {
		Slog.d(TAG, " enter split mode unminimized ");

+0 −2

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

		mDivider.onTasksReady();
		}
		}
		}