diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-09-26 14:22:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 14:47:01 -0700 |
| commit | 833f775afc9515567dc5aaf0cafe20e006e77545 (patch) | |
| tree | 5fcc084e3ea278e7d4a3475002e668584a22f664 /src/com/android/gallery3d/app/AlbumPage.java | |
| parent | 726cbd1af44cf7b0f795c4f0639b9b358be960c1 (diff) | |
| download | android_packages_apps_Gallery2-833f775afc9515567dc5aaf0cafe20e006e77545.tar.gz android_packages_apps_Gallery2-833f775afc9515567dc5aaf0cafe20e006e77545.tar.bz2 android_packages_apps_Gallery2-833f775afc9515567dc5aaf0cafe20e006e77545.zip | |
Fix behavior of up button in Camera app
Bug: 7233448
- Up button now goes to gallery root when appropriate.
Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 30682a115..a19798f2b 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -214,7 +214,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster } private void onUpPressed() { - if (mActivity.getStateManager().getStateCount() > 1) { + if (mInCameraApp) { + GalleryUtils.startGalleryActivity(mActivity); + } else if (mActivity.getStateManager().getStateCount() > 1) { super.onBackPressed(); } else if (mParentMediaSetString != null) { Bundle data = new Bundle(getData()); |