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

Commit 44db516a authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev am: 94f81431 

am: bb9e8cce

Change-Id: I8157d308f178f2693529452f9fe83ab8442a5e73
parents 14ff07f3 bb9e8cce

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            // Since we won't get a setOccluded call we have to reset the view manually such that

            // Since we won't get a setOccluded call we have to reset the view manually such that

            // the bouncer goes away.

            // the bouncer goes away.

            if (mOccluded) {

            if (mOccluded) {

                reset(false /* hideBouncerWhenShowing */);

                reset(true /* hideBouncerWhenShowing */);

            }

            }

        }

        }

    };

    };
@@ -316,6 +316,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                return;

                return;

            }

            }

        }

        }

        boolean isOccluding = !mOccluded && occluded;

        mOccluded = occluded;

        mOccluded = occluded;

        if (mShowing) {

        if (mShowing) {

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

            mStatusBar.updateMediaMetaData(false, animate && !occluded);
@@ -326,7 +327,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        if (!mDozing) {

        if (!mDozing) {

            // If Keyguard is reshown, don't hide the bouncer as it might just have been requested

            // If Keyguard is reshown, don't hide the bouncer as it might just have been requested

            // by a FLAG_DISMISS_KEYGUARD_ACTIVITY.

            // by a FLAG_DISMISS_KEYGUARD_ACTIVITY.

            reset(false /* hideBouncerWhenShowing*/);

            reset(isOccluding /* hideBouncerWhenShowing*/);

        }

        }

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

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

            mStatusBar.animateKeyguardUnoccluding();

            mStatusBar.animateKeyguardUnoccluding();