From 98578b7e28cbd9ad2d4fae3fabc662bf242c9d3e Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Tue, 28 Apr 2020 15:22:39 +0800
Subject: [PATCH] Reset Divider#mMinimized when dismiss split

The divider view did not animate while minimizing dock stack
because the mMinimized did not reset after split-screen dismissed.

Bug: 153579514
Test: enter split-screen
Change-Id: I4fa8d773df0a781aa718331fc70f7f94928fdb29
---
 .../src/com/android/systemui/stackdivider/Divider.java       | 5 +++++
 .../systemui/stackdivider/SplitScreenTaskOrganizer.java      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
index 555202a2b02ca..84de45f23b620 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
@@ -634,6 +634,11 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
         }
     }
 
+    void onSplitDismissed() {
+        mMinimized = false;
+        updateVisibility(false /* visible */);
+    }
+
     /** Switch to minimized state if appropriate */
     public void setMinimized(final boolean minimized) {
         if (DEBUG) Slog.d(TAG, "posting ext setMinimized " + minimized + " vis:" + mVisible);
diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
index 717edc591d7fc..2862c836942fe 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
@@ -201,7 +201,7 @@ class SplitScreenTaskOrganizer extends TaskOrganizer {
                             + mPrimary.topActivityType + "  " + mSecondary.topActivityType);
                 }
                 WindowManagerProxy.applyDismissSplit(this, true /* dismissOrMaximize */);
-                mDivider.updateVisibility(false /* visible */);
+                mDivider.onSplitDismissed();
             } else if (!primaryIsEmpty && primaryWasEmpty && secondaryWasEmpty) {
                 // Wasn't in split-mode (both were empty), but now that the primary split is
                 // populated, we should fully enter split by moving everything else into secondary.