From bf1a597b20e59773242fb90c3a6f64a5da80bc4c Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Thu, 28 May 2020 08:39:59 +0000
Subject: [PATCH] Revert "Only add divider when it need to show"

This reverts commit 91bba497c314e4d717a94ea72c928a76a192b332.

Reason for revert: unblock wm presubmit

Fix: 157629296

Change-Id: I04fd8b79de025d7c531ac03218a7590e6a32e1be
---
 core/java/android/view/WindowlessWindowManager.java    |  1 +
 .../src/com/android/systemui/stackdivider/Divider.java | 10 ++++++----
 .../stackdivider/SplitScreenTaskOrganizer.java         |  2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java
index 571a9dd899430..d20ffb3a6ec11 100644
--- a/core/java/android/view/WindowlessWindowManager.java
+++ b/core/java/android/view/WindowlessWindowManager.java
@@ -41,6 +41,7 @@ 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;
diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
index 5bc295bcd136f..95aceed1126b9 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
@@ -238,10 +238,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
             mSplitLayout.mSecondary = new Rect(mRotateSplitLayout.mSecondary);
             mRotateSplitLayout = null;
         }
-
-        if (isSplitActive()) {
-            update(newConfig);
-        }
+        update(newConfig);
     }
 
     Handler getHandler() {
@@ -316,6 +313,11 @@ 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) {
diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
index 5ff1f3ab14222..c496d22802223 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
@@ -113,6 +113,8 @@ class SplitScreenTaskOrganizer extends TaskOrganizer {
                 t.setColor(mSecondaryDim, new float[]{0f, 0f, 0f});
                 t.apply();
                 releaseTransaction(t);
+
+                mDivider.onTasksReady();
             }
         }
     }