diff options
| author | Owen Lin <owenlin@google.com> | 2012-09-20 12:22:54 +0800 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2012-09-26 12:04:45 -0700 |
| commit | fb0e11a104271fb7455e929094361a972d966508 (patch) | |
| tree | fbaf76e55883a7587efdd2ce3aa1de6eff707606 /src/com/android | |
| parent | 3959f7359020a371a861c080d819b47a0be3c2a5 (diff) | |
| download | android_packages_apps_Snap-fb0e11a104271fb7455e929094361a972d966508.tar.gz android_packages_apps_Snap-fb0e11a104271fb7455e929094361a972d966508.tar.bz2 android_packages_apps_Snap-fb0e11a104271fb7455e929094361a972d966508.zip | |
Don't set treat back as up if there is no parent album.
Change-Id: I2ecadd8ace0f8d3e5ed38710a776e7c114f24274
fix: 7180467
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/gallery3d/app/Gallery.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java index b35c11496..488c6c12f 100644 --- a/src/com/android/gallery3d/app/Gallery.java +++ b/src/com/android/gallery3d/app/Gallery.java @@ -194,19 +194,22 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi } else { Path itemPath = dm.findPathByUri(uri, intent.getType()); Path albumPath = dm.getDefaultSetOf(itemPath); - // TODO: Make this parameter public so other activities can reference it. - boolean singleItemOnly = intent.getBooleanExtra("SingleItemOnly", false); - if (!singleItemOnly && (albumPath != null)) { - data.putString(PhotoPage.KEY_MEDIA_SET_PATH, albumPath.toString()); - } + 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) { + + // TODO: Make the parameter "SingleItemOnly" public so other + // activities can reference it. + boolean singleItemOnly = (albumPath == null) + || intent.getBooleanExtra("SingleItemOnly", false); + if (!singleItemOnly) { + data.putString(PhotoPage.KEY_MEDIA_SET_PATH, albumPath.toString()); // 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); + if (intent.getBooleanExtra(PhotoPage.KEY_TREAT_BACK_AS_UP, false) + || ((intent.getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK) != 0)) { + data.putBoolean(PhotoPage.KEY_TREAT_BACK_AS_UP, true); + } } // Displays the filename as title, reading the filename from the interface: |