summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-09-27 20:48:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-27 20:48:09 -0700
commitd5f7a8be68d1eab95f05fa6b28e76c192a6a9238 (patch)
treea9299887652f72131a98661e57f755bd06f03ba2
parent7cf9695e62cf1697bf2735df81972a7980fa3bce (diff)
parent624ed9df710ac4e34f3ff1d0c3bf4acd1c056258 (diff)
downloadandroid_packages_apps_Gallery2-d5f7a8be68d1eab95f05fa6b28e76c192a6a9238.tar.gz
android_packages_apps_Gallery2-d5f7a8be68d1eab95f05fa6b28e76c192a6a9238.tar.bz2
android_packages_apps_Gallery2-d5f7a8be68d1eab95f05fa6b28e76c192a6a9238.zip
am 624ed9df: Fix up button behavior in camera app
* commit '624ed9df710ac4e34f3ff1d0c3bf4acd1c056258': Fix up button behavior in camera app
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java6
1 files changed, 5 insertions, 1 deletions
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();
+ }
}
}