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 am: a957ca5bfd

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

Change-Id: I7f7f2f52ea107f451b68ea7f4a0a0eaedc4c9aa6
This commit is contained in:
Evan Rosky
2020-07-15 19:56:30 +00:00
committed by Automerger Merge Worker
parent d50eb6eeb5 a957ca5bfd
commit 35174d85d2
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;
}
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);