Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Idc8f7cb19d3ee6efc688747d974aeaa58c4b3ed7
This commit is contained in:
Evan Rosky
2020-07-15 19:35:43 +00:00
committed by Automerger Merge Worker
parent 7b142fb0e4 6a630f3994
commit a957ca5bfd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
View File

@@ -197,7 +197,9 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
return; return;
} }
mView.setHidden(mKeyguardStateController.isShowing()); mView.setHidden(mKeyguardStateController.isShowing());
mImePositionProcessor.updateAdjustForIme(); if (!mKeyguardStateController.isShowing()) {
mImePositionProcessor.updateAdjustForIme();
}
} }
@Override @Override
@@ -316,7 +318,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
} }
private void update(Configuration configuration) { private void update(Configuration configuration) {
final boolean isDividerHidden = mView != null && mView.isHidden(); final boolean isDividerHidden = mView != null && mKeyguardStateController.isShowing();
removeDivider(); removeDivider();
addDivider(configuration); addDivider(configuration);