summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2013-08-23 13:34:46 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-08-23 13:34:46 +0000
commitabb985fb4353973570e4d235eed648786784ccff (patch)
tree5cc931d5c023b8596d86ef3a9c61b18b261bdde4
parenta8fc994a61fb989a5dabf038e1b87686fb31e705 (diff)
parent2d6c9bb1b41a22a6e5e0f01be1c9b8931b55a71a (diff)
downloadframeworks_base-abb985fb4353973570e4d235eed648786784ccff.zip
frameworks_base-abb985fb4353973570e4d235eed648786784ccff.tar.gz
frameworks_base-abb985fb4353973570e4d235eed648786784ccff.tar.bz2
Merge "Fix Home/Menu/Back keys' unlock" into cm-10.1
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
index 6e338ce..182c74d 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
@@ -229,14 +229,17 @@ public class KeyguardViewManager {
if (mKeyguardView.handleBackKey()) {
return true;
}
+ break;
case KeyEvent.KEYCODE_HOME:
if (mKeyguardView.handleHomeKey()) {
return true;
}
+ break;
case KeyEvent.KEYCODE_MENU:
if (mKeyguardView.handleMenuKey()) {
return true;
}
+ break;
}
}
return false;