summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/AlbumPage.java
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-09-27 18:10:06 -0700
committerBobby Georgescu <georgescu@google.com>2012-09-27 18:12:27 -0700
commit624ed9df710ac4e34f3ff1d0c3bf4acd1c056258 (patch)
tree87c2d537380906e2652b936212d810efa605dc06 /src/com/android/gallery3d/app/AlbumPage.java
parent863b4e65d172a19111f46e43f97e7e41927a3bc7 (diff)
downloadandroid_packages_apps_Gallery2-624ed9df710ac4e34f3ff1d0c3bf4acd1c056258.tar.gz
android_packages_apps_Gallery2-624ed9df710ac4e34f3ff1d0c3bf4acd1c056258.tar.bz2
android_packages_apps_Gallery2-624ed9df710ac4e34f3ff1d0c3bf4acd1c056258.zip
Fix up button behavior in camera app
Bug: 7233448 Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumPage.java')
-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();
+ }
}
}