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

Commit 8c8bcc16 authored Apr 16, 2014 by Jorim Jaggi

Make MENU key work again to dismiss insecure Keyguard.

Bug: 14110426
Change-Id: Iab8ec9633a2169e6def13a0c6e09b77543adbb41

parent a005f1b6

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

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -142,4 +142,18 @@ public class KeyguardBouncer {
	}		}
	return false;		return false;
	}		}

			public boolean onMenuPressed() {
			ensureView();
			if (mKeyguardView.handleMenuKey()) {

			// We need to show it in case it is secure. If not, it will get dismissed in any case.
			mRoot.setVisibility(View.VISIBLE);
			mKeyguardView.requestFocus();
			mKeyguardView.onResume();
			return true;
			} else {
			return false;
			}
			}
	}		}

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2855,6 +2855,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
	}		}
	}		}

			public boolean onMenuPressed() {
			return mOnKeyguard && mStatusBarKeyguardViewManager.onMenuPressed();
			}

	public boolean onBackPressed() {		public boolean onBackPressed() {
	if (mOnKeyguard) {		if (mOnKeyguard) {
	return mStatusBarKeyguardViewManager.onBackPressed();		return mStatusBarKeyguardViewManager.onBackPressed();

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -206,4 +206,8 @@ public class StatusBarKeyguardViewManager {
	mContainer.setSystemUiVisibility(vis \| View.STATUS_BAR_DISABLE_BACK);		mContainer.setSystemUiVisibility(vis \| View.STATUS_BAR_DISABLE_BACK);
	}		}
	}		}

			public boolean onMenuPressed() {
			return mBouncer.onMenuPressed();
			}
	}		}

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

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -82,6 +82,10 @@ public class StatusBarWindowView extends FrameLayout
	mService.onBackPressed();		mService.onBackPressed();
	}		}
	return true;		return true;
			case KeyEvent.KEYCODE_MENU:
			if (!down) {
			return mService.onMenuPressed();
			}
	}		}
	return super.dispatchKeyEvent(event);		return super.dispatchKeyEvent(event);
	}		}