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

Commit 16467541 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dreams: Fix lockscreen flicker"

parents 3b26c211 909fe2d4

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+4 −2
Original line number Diff line number Diff line
@@ -264,10 +264,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            }

        }

        mOccluded = occluded;

        if (mShowing) {

            mPhoneStatusBar.updateMediaMetaData(false, animate && !occluded);

        }

        mStatusBarWindowManager.setKeyguardOccluded(occluded);

        reset();

        if (animate && !occluded) {

        if (animate && !occluded && mShowing) {

            mPhoneStatusBar.animateKeyguardUnoccluding();

        }

    }

services/core/java/com/android/server/policy/PhoneWindowManager.java

+4 −0
Original line number Diff line number Diff line
@@ -5484,6 +5484,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            mStatusBar.getAttrs().privateFlags &= ~PRIVATE_FLAG_KEYGUARD;

            mStatusBar.getAttrs().flags &= ~FLAG_SHOW_WALLPAPER;

            return true;

        } else if (wasOccluded != isOccluded) {

            mKeyguardOccluded = isOccluded;

            mKeyguardDelegate.setOccluded(isOccluded, false /* animate */);

            return false;

        } else {

            return false;

        }