diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-03-10 04:59:34 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-03-10 04:59:34 -0800 |
| commit | 97b5b5bdf26970e8873ada05de73555a9872c933 (patch) | |
| tree | 403d5107d565566fbf7341b9f068b1f00efbf417 | |
| parent | 7b0b29812811ec993883fffa2cd3c63215214a88 (diff) | |
| parent | fb772730018951d5453f40306f7313d21b9a408c (diff) | |
| download | android_packages_apps_Gallery2-97b5b5bdf26970e8873ada05de73555a9872c933.tar.gz android_packages_apps_Gallery2-97b5b5bdf26970e8873ada05de73555a9872c933.tar.bz2 android_packages_apps_Gallery2-97b5b5bdf26970e8873ada05de73555a9872c933.zip | |
Merge "Gallery2: fix function of back button in top left corner." into android_ui.lnx.1.2-dev
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryActivity.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java index 725679109..88de5bdff 100644 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -530,13 +530,6 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On || 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 - 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); - } } data.putBoolean("SingleItemOnly", singleItemOnly); getStateManager().startState(SinglePhotoPage.class, data); |