Merge "Revert "Only add divider when it need to show"" into rvc-dev am: 77db95ce85 am: 778d68307c am: 5d9a7cec42 am: d53a32fa04

Change-Id: Ia9dfc6d5fc08c4efc59d79c0fbcae46ef2868af9

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;

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) {

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();
             }
         }
     }