From 8ed9870f54eb06e32f3639cd4f2852876bfc1666 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 29 Sep 2009 02:52:12 -0700 Subject: [PATCH] Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices Changed to use config.xml and overlays to enable. --- policy/com/android/internal/policy/impl/LockScreen.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/policy/com/android/internal/policy/impl/LockScreen.java b/policy/com/android/internal/policy/impl/LockScreen.java index 67533242f514f..13207b70b0c70 100644 --- a/policy/com/android/internal/policy/impl/LockScreen.java +++ b/policy/com/android/internal/policy/impl/LockScreen.java @@ -81,6 +81,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM private java.text.DateFormat mDateFormat; private java.text.DateFormat mTimeFormat; private boolean mCreatedInPortrait; + private boolean mDisableMenuKeyInLockScreen; /** * The status of this lock screen. @@ -149,6 +150,9 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM mUpdateMonitor = updateMonitor; mCallback = callback; + mDisableMenuKeyInLockScreen = getResources() + .getBoolean(R.bool.config_disableMenuKeyInLockScreen); + mCreatedInPortrait = updateMonitor.isInPortrait(); final LayoutInflater inflater = LayoutInflater.from(context); @@ -213,7 +217,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_MENU) { + if (keyCode == KeyEvent.KEYCODE_MENU && !mDisableMenuKeyInLockScreen) { mCallback.goToUnlockScreen(); } return false;