Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad

1 files changed, 10 insertions, 8 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index c38b13031..18c8a9ab8 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1141,15 +1141,17 @@ public class CameraActivity extends Activity
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (mCurrentModule.onKeyDown(keyCode, event)) {
-            return true;
-        }
-        // Prevent software keyboard or voice search from showing up.
-        if (keyCode == KeyEvent.KEYCODE_SEARCH
-                || keyCode == KeyEvent.KEYCODE_MENU) {
-            if (event.isLongPress()) {
+        if (mFilmStripView.inCameraFullscreen()) {
+            if (mCurrentModule.onKeyDown(keyCode, event)) {
                 return true;
             }
+            // Prevent software keyboard or voice search from showing up.
+            if (keyCode == KeyEvent.KEYCODE_SEARCH
+                    || keyCode == KeyEvent.KEYCODE_MENU) {
+                if (event.isLongPress()) {
+                    return true;
+                }
+            }
         }
 
         return super.onKeyDown(keyCode, event);
@@ -1157,7 +1159,7 @@ public class CameraActivity extends Activity
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (mCurrentModule.onKeyUp(keyCode, event)) {
+        if (mFilmStripView.inCameraFullscreen() && mCurrentModule.onKeyUp(keyCode, event)) {
             return true;
         }
         return super.onKeyUp(keyCode, event);