diff options
| author | Doris Liu <tianliu@google.com> | 2012-09-10 10:24:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-10 10:24:45 -0700 |
| commit | 1ab2f94443bba3ac3db22243216e7cfdf0167931 (patch) | |
| tree | 86decff66906804e268d393db869696c5485adca /src | |
| parent | d57afb53c887891024a5dad825d88f088a598258 (diff) | |
| parent | 0f229418c48d0d54004702b175564c4e638f15bd (diff) | |
| download | android_packages_apps_Snap-1ab2f94443bba3ac3db22243216e7cfdf0167931.tar.gz android_packages_apps_Snap-1ab2f94443bba3ac3db22243216e7cfdf0167931.tar.bz2 android_packages_apps_Snap-1ab2f94443bba3ac3db22243216e7cfdf0167931.zip | |
Merge "Back button should progress through the app" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/Gallery.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java index ae104eb53..b35c11496 100644 --- a/src/com/android/gallery3d/app/Gallery.java +++ b/src/com/android/gallery3d/app/Gallery.java @@ -202,6 +202,11 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH, itemPath.toString()); if (intent.getBooleanExtra(PhotoPage.KEY_TREAT_BACK_AS_UP, false)) { data.putBoolean(PhotoPage.KEY_TREAT_BACK_AS_UP, true); + } else if ((intent.getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK) != 0) { + // when FLAG_ACTIVITY_NEW_TASK is set, (e.g. when intent is fired + // from notification), back button should behave the same as up button + // rather than taking users back to the home screen + data.putBoolean(PhotoPage.KEY_TREAT_BACK_AS_UP, true); } // Displays the filename as title, reading the filename from the interface: |