summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-09-11 11:47:52 +0800
committerOwen Lin <owenlin@google.com>2012-09-11 11:52:48 +0800
commit0caf3cfbbc1a200e060da11d44f37dc8da4699be (patch)
treee27abb43fa5bd09b48d108262374663584a6f878
parentacbff926677310747417338e22ab018dca80e4ff (diff)
downloadandroid_packages_apps_Snap-0caf3cfbbc1a200e060da11d44f37dc8da4699be.tar.gz
android_packages_apps_Snap-0caf3cfbbc1a200e060da11d44f37dc8da4699be.tar.bz2
android_packages_apps_Snap-0caf3cfbbc1a200e060da11d44f37dc8da4699be.zip
Don't start filmstrip mode in Get Content mode.
Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837 fix: 7135936
-rw-r--r--src/com/android/gallery3d/app/AlbumSetPage.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index 8dee15431..c61890c06 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -53,7 +53,6 @@ import com.android.gallery3d.ui.SynchronizedHandler;
import com.android.gallery3d.util.Future;
import com.android.gallery3d.util.GalleryUtils;
import com.android.gallery3d.util.HelpUtils;
-import com.android.gallery3d.util.MediaSetUtils;
import java.lang.ref.WeakReference;
@@ -260,7 +259,7 @@ public class AlbumSetPage extends ActivityState implements
if (!mGetContent && (targetSet.getSupportedOperations()
& MediaObject.SUPPORT_IMPORT) != 0) {
data.putBoolean(AlbumPage.KEY_AUTO_SELECT_ALL, true);
- } else if (albumShouldOpenInFilmstrip(targetSet)) {
+ } else if (!mGetContent && albumShouldOpenInFilmstrip(targetSet)) {
data.putInt(PhotoPage.KEY_INDEX_HINT, 0);
data.putString(PhotoPage.KEY_MEDIA_SET_PATH,
mediaPath);