From: Bobby Georgescu <georgescu@google.com>
Date: Fri, 28 Sep 2012 01:10:06 +0000 (-0700)
Subject: Fix up button behavior in camera app
X-Git-Tag: android-x86-7.1-r1~1268^2~364
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=624ed9df;p=android-x86%2Fpackages-apps-Gallery2.git

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 a19798f2b..29b657339 100644
--- 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();
+            }
         }
     }