From df3cfc1e13a0c83f277dbcfb222ae7106e2ef77f Mon Sep 17 00:00:00 2001
From: Tony Huang <tonyychuang@google.com>
Date: Wed, 29 Apr 2020 15:47:53 +0800
Subject: [PATCH] Set divider hidden status after it update

If device is landscape then enter keygaurd, it will rotate to portrait
back but it does not handle previous hidden status so the divider will
show after it update.

Fix it by check hidden status before divider removed and set it after
divider added again.

Bug: 154862056
Test: enter split, rotate then screen off, enter keygaurd to check
      divider is hidden
Change-Id: If19bf9304c38ecee968aefba1b66f154701c5c09
---
 .../com/android/systemui/stackdivider/Divider.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
index f36f8c1318486..99397d1789450 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
@@ -574,11 +574,17 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
     }
 
     private void update(Configuration configuration) {
+        final boolean isDividerHidden = mView != null && mView.isHidden();
+
         removeDivider();
         addDivider(configuration);
-        if (mMinimized && mView != null) {
-            mView.setMinimizedDockStack(true, mHomeStackResizable);
-            updateTouchable();
+
+        if (mView != null) {
+            if (mMinimized) {
+                mView.setMinimizedDockStack(true, mHomeStackResizable);
+                updateTouchable();
+            }
+            mView.setHidden(isDividerHidden);
         }
     }