Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9addc13d authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Use keyguard state directly instead of trying to remember it" into... 

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

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

Change-Id: I07fa9412046ea05d4860da92414287438921b24a
parents 4d745b86 a957ca5b

packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java

+4 −2
Original line number Diff line number Diff line
@@ -197,8 +197,10 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 
                    return;

                }

                mView.setHidden(mKeyguardStateController.isShowing());

                if (!mKeyguardStateController.isShowing()) {

                    mImePositionProcessor.updateAdjustForIme();

                }

            }



            @Override

            public void onKeyguardFadingAwayChanged() {
@@ -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);