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
This commit is contained in:
Evan Rosky
2020-07-15 19:56:52 +00:00
committed by Automerger Merge Worker

View File

@@ -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);