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

Commit c6d25c9b authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 

* commit '5224a3f29ac75dc0c9493bc45fa593dde8872b8d':
  Only dismiss Keyguard with space when screen is on
parents 7a79b330 2cf8b71e

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -3612,7 +3612,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    }

    }





    public boolean onSpacePressed() {

    public boolean onSpacePressed() {

        if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {

        if (mScreenOn != null && mScreenOn

                && (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)) {

            animateCollapsePanels(0 /* flags */, true /* force */);

            animateCollapsePanels(0 /* flags */, true /* force */);

            return true;

            return true;

        }

        }