From: Owen Lin <owenlin@google.com>
Date: Tue, 11 Sep 2012 03:47:52 +0000 (+0800)
Subject: Don't start filmstrip mode in Get Content mode.
X-Git-Tag: android-x86-6.0-r3~2044^2~1094^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0caf3cfbbc1a200e060da11d44f37dc8da4699be;p=android-x86%2Fpackages-apps-Camera2.git

Don't start filmstrip mode in Get Content mode.

Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837
fix: 7135936
---

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);