summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/WideAnglePanoramaModule.java
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2014-01-28 00:44:30 +0200
committerMichael Bestas <mikeioannina@gmail.com>2015-09-17 23:26:02 +0300
commitcea0604f347b07d51d48b14b6c6b7d43ba1b0377 (patch)
tree8e2ec7828858ab94caf542a42de558091fcf154b /src/com/android/camera/WideAnglePanoramaModule.java
parent4b6ade90186f024ce6986a5a13efa3be9e9c8d80 (diff)
downloadandroid_packages_apps_Snap-cea0604f347b07d51d48b14b6c6b7d43ba1b0377.tar.gz
android_packages_apps_Snap-cea0604f347b07d51d48b14b6c6b7d43ba1b0377.tar.bz2
android_packages_apps_Snap-cea0604f347b07d51d48b14b6c6b7d43ba1b0377.zip
Camera: Handle keys only while in app
Thanks to Lars Greiss (SlimRoms) Change-Id: I63f757d25260fba4683f494f8b4daf178a2b4e13
Diffstat (limited to 'src/com/android/camera/WideAnglePanoramaModule.java')
-rw-r--r--src/com/android/camera/WideAnglePanoramaModule.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 30fda16f5..e9090b72e 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -1173,6 +1173,14 @@ public class WideAnglePanoramaModule
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
+ // Do not handle any key if the activity is paused
+ // or not in active camera/video mode
+ if (mPaused) {
+ return true;
+ } else if (!mActivity.isInCameraApp()) {
+ return false;
+ }
+
switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_VOLUME_DOWN: