Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f3994 am: 2364eaf2e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152621

Change-Id: Iecda3cc9a5bac3b2d0577e613d4765ab912f2601

1 files changed, 4 insertions, 2 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
index d9d46605f209..570a4bb3cd12 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
@@ -197,7 +197,9 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
                     return;
                 }
                 mView.setHidden(mKeyguardStateController.isShowing());
-                mImePositionProcessor.updateAdjustForIme();
+                if (!mKeyguardStateController.isShowing()) {
+                    mImePositionProcessor.updateAdjustForIme();
+                }
             }
 
             @Override
@@ -316,7 +318,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
     }
 
     private void update(Configuration configuration) {
-        final boolean isDividerHidden = mView != null && mView.isHidden();
+        final boolean isDividerHidden = mView != null && mKeyguardStateController.isShowing();
 
         removeDivider();
         addDivider(configuration);