summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-10 14:06:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-10 14:06:10 -0700
commit9c394897104d53335e912f50b7d805655c86a0c6 (patch)
tree87a487d758eb439c3a097cdb52d7ca3dfc33a8f8
parentb736d8a35967bcf81a7ee80080343ff6e497ca11 (diff)
parentaef384c77c316afd4e99946a3cf38c25e200544b (diff)
downloadandroid_packages_apps_Snap-9c394897104d53335e912f50b7d805655c86a0c6.tar.gz
android_packages_apps_Snap-9c394897104d53335e912f50b7d805655c86a0c6.tar.bz2
android_packages_apps_Snap-9c394897104d53335e912f50b7d805655c86a0c6.zip
am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
* commit 'db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b': Fix missing camera thumbnail in filmstrip
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 9cc56cc50..c956bc969 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -299,6 +299,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
PhotoPage.MSG_ALBUMPAGE_STARTED);
data.putBoolean(PhotoPage.KEY_START_IN_FILMSTRIP,
startInFilmstrip);
+ data.putBoolean(PhotoPage.KEY_IN_CAMERA_ROLL, mMediaSet.isCameraRoll());
mActivity.getStateManager().startStateForResult(
PhotoPage.class, REQUEST_PHOTO, data);
}