Fix up button behavior in camera app

Bug: 7233448
Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index a19798f..29b6573 100644 (file)
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -209,7 +209,11 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
             }
             // TODO: fix this regression
             // mAlbumView.savePositions(PositionRepository.getInstance(mActivity));
-            onUpPressed();
+            if (mInCameraApp) {
+                super.onBackPressed();
+            } else {
+                onUpPressed();
+            }
         }
     }