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

Commit e3e8746e authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Fix pressing back on bouncer" into qt-dev

parents 3f713de6 baa47b62

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

+5 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,11 @@ public class NotificationPanelView extends PanelView implements 
        } else if (oldState == StatusBarState.SHADE_LOCKED

                && statusBarState == StatusBarState.KEYGUARD) {

            animateKeyguardStatusBarIn(StackStateAnimator.ANIMATION_DURATION_STANDARD);

            // Only animate header if the header is visible. If not, it will partially animate out

            // the top of QS

            if (!mQsExpanded) {

                mQs.animateHeaderSlidingOut();

            }

        } else {

            mKeyguardStatusBar.setAlpha(1f);

            mKeyguardStatusBar.setVisibility(keyguardShowing ? View.VISIBLE : View.INVISIBLE);

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

+7 −1
Original line number Diff line number Diff line
@@ -661,7 +661,13 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    public boolean onBackPressed(boolean hideImmediately) {

        if (mBouncer.isShowing()) {

            mStatusBar.endAffordanceLaunch();

            // The second condition is for SIM card locked bouncer

            if (mBouncer.isScrimmed() && !mBouncer.needsFullscreenBouncer()) {

                hideBouncer(false);

                updateStates();

            } else {

                reset(hideImmediately);

            }

            return true;

        }

        return false;