summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-05-14 12:35:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-14 12:35:46 +0000
commit67c26cba2177e8be7bb5b17eb2d8f0dbcbfd7b1f (patch)
tree00078e1fdd8e86306d80d7f98414d800263765ed /packages/Keyguard
parentfae5984758af9844ff00a19e6c2ff9917dc3e73d (diff)
parentdf993513fbfe0e952175c1c5384458deaa1ff01a (diff)
downloadframeworks_base-67c26cba2177e8be7bb5b17eb2d8f0dbcbfd7b1f.zip
frameworks_base-67c26cba2177e8be7bb5b17eb2d8f0dbcbfd7b1f.tar.gz
frameworks_base-67c26cba2177e8be7bb5b17eb2d8f0dbcbfd7b1f.tar.bz2
Merge "Handle media key events correctly on Keyguard."
Diffstat (limited to 'packages/Keyguard')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
index d8e5b8a..a9206e7 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
@@ -297,7 +297,7 @@ public abstract class KeyguardViewBase extends FrameLayout implements SecurityCa
* @param event The key event
* @return whether the event was consumed as a media key.
*/
- private boolean interceptMediaKey(KeyEvent event) {
+ public boolean interceptMediaKey(KeyEvent event) {
final int keyCode = event.getKeyCode();
if (event.getAction() == KeyEvent.ACTION_DOWN) {
switch (keyCode) {