1 files changed, 15 insertions, 12 deletions
diff --git a/src/com/android/camera/ImageGallery2.java b/src/com/android/camera/ImageGallery2.java
index 365be0f..1e02555 100644
--- a/src/com/android/camera/ImageGallery2.java
+++ b/src/com/android/camera/ImageGallery2.java
@@ -235,8 +235,15 @@ public class ImageGallery2 extends Activity {
         }
     };
 
+    private boolean isPaused() {
+        // Don't process event in pause state.
+        return mPausing;
+    }
+    
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (isPaused())  return false;
+        
         if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
             mGvs.select(-2, false);
             // The keyUp doesn't get called when the longpress menu comes up. We only get here when the user
@@ -251,13 +258,11 @@ public class ImageGallery2 extends Activity {
         }
         return super.onKeyUp(keyCode, event);
     }
-
+    
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (mGvs.mCurrentSpec == null) {
-            // View.onLayout hasn't been called so we can't handle onKeyDown event yet.
-            return false;
-        }
+        if (isPaused())  return false;
+        
         boolean handled = true;
         int sel = mGvs.mCurrentSelection;
         int columns = mGvs.mCurrentSpec.mColumns;
@@ -625,11 +630,12 @@ public class ImageGallery2 extends Activity {
     @Override
     public boolean onCreateOptionsMenu(android.view.Menu menu) {
         MenuItem item;
-        if (! isPickIntent()) {
+        if (isPickIntent()) {
+            MenuHelper.addCapturePictureMenuItems(menu, this);
+        } else {
             MenuHelper.addCaptureMenuItems(menu, this);
             if ((mInclusion & ImageManager.INCLUDE_IMAGES) != 0) {
                 mSlideShowItem = addSlideShowMenu(menu, 5);
-
             }
         }
 
@@ -851,11 +857,6 @@ public class ImageGallery2 extends Activity {
                 }
 
                 @Override
-                public void onShowPress(MotionEvent e) {
-                    super.onShowPress(e);
-                }
-
-                @Override
                 public boolean onSingleTapUp(MotionEvent e) {
                     select(mCurrentSelection, false);
                     int index = computeSelectedIndex(e);
@@ -1746,6 +1747,8 @@ public class ImageGallery2 extends Activity {
 
         @Override
         public boolean onTouchEvent(android.view.MotionEvent ev) {
+            if (mGallery.isPaused())  return false;
+            
             mGestureDetector.onTouchEvent(ev);
             return true;
         }