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
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:22:26 -0700
commit1fd7ce85ce5e60f4d11b3a7ef3c2d1bc82448488 (patch)
tree58b64eaa71ef57cb35416df66c77bba985d0a985 /src/com/android/camera/WideAnglePanoramaModule.java
parent82d5347870e831cbfca5b8329776a091fcc43eeb (diff)
downloadandroid_packages_apps_Snap-1fd7ce85ce5e60f4d11b3a7ef3c2d1bc82448488.tar.gz
android_packages_apps_Snap-1fd7ce85ce5e60f4d11b3a7ef3c2d1bc82448488.tar.bz2
android_packages_apps_Snap-1fd7ce85ce5e60f4d11b3a7ef3c2d1bc82448488.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 b88ec9e09..2580c5a0d 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -1235,6 +1235,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: