OSDN Git Service

Don't start filmstrip mode in Get Content mode.
authorOwen Lin <owenlin@google.com>
Tue, 11 Sep 2012 03:47:52 +0000 (11:47 +0800)
committerOwen Lin <owenlin@google.com>
Tue, 11 Sep 2012 03:52:48 +0000 (11:52 +0800)
Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837
fix: 7135936

src/com/android/gallery3d/app/AlbumSetPage.java

index 8dee154..c61890c 100644 (file)
@@ -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);