Merge "Ability to dismiss lockscreen with space key" (7e6c3bf2) · Commits · e / os / android_frameworks_base

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

+14 −1

Original line number	Diff line number	Diff line
		@@ -1653,7 +1653,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		public void animateCollapsePanels(int flags) {
		if (mState == StatusBarState.KEYGUARD \|\| mState == StatusBarState.SHADE_LOCKED) {
		animateCollapsePanels(flags, false /* force */);
		}

		public void animateCollapsePanels(int flags, boolean force) {
		if (!force &&
		(mState == StatusBarState.KEYGUARD \|\| mState == StatusBarState.SHADE_LOCKED)) {
		return;
		}
		if (SPEW) {
		@@ -2916,6 +2921,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		}

		public boolean onSpacePressed() {
		if (mState == StatusBarState.KEYGUARD \|\| mState == StatusBarState.SHADE_LOCKED) {
		animateCollapsePanels(0 /* flags /, true / force */);
		return true;
		}
		return false;
		}

		private void showBouncer() {
		if (mState == StatusBarState.KEYGUARD \|\| mState == StatusBarState.SHADE_LOCKED) {
		mWaitingForKeyguardExit = true;

+4 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,10 @@ public class StatusBarWindowView extends FrameLayout {
		if (!down) {
		return mService.onMenuPressed();
		}
		case KeyEvent.KEYCODE_SPACE:
		if (!down) {
		return mService.onSpacePressed();
		}
		}
		if (mService.interceptMediaKey(event)) {
		return true;