Merge "Gallery2: Fix filmstrip source index" into cm-10.2

1 files changed, 13 insertions, 3 deletions

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 899309d8f..76234bda8 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -164,6 +164,8 @@ public abstract class PhotoPage extends ActivityState implements
     private boolean mHasCameraScreennailOrPlaceholder = false;
     private boolean mRecenterCameraOnResume = true;
 
+    private int mGalleryMode = GalleryActionBar.ALBUM_FILMSTRIP_MODE_SELECTED;
+
     // These are only valid after the panorama callback
     private boolean mIsPanorama;
     private boolean mIsPanorama360;
@@ -1503,18 +1505,26 @@ public abstract class PhotoPage extends ActivityState implements
 
         @Override
         public int size() {
-            return mMediaSet != null ? mMediaSet.getMediaItemCount() : 1;
+            if (mMediaSet == null) {
+                return 1;
+            }
+            return (mGalleryMode == GalleryActionBar.ALBUM_GRID_MODE_SELECTED)
+                        ? mMediaSet.getMediaItemCount()
+                        : mMediaSet.getMediaItemCount() - 1;
         }
 
         @Override
         public int setIndex() {
-            return mModel.getCurrentIndex();
+            return (mGalleryMode == GalleryActionBar.ALBUM_GRID_MODE_SELECTED)
+                        ? mModel.getCurrentIndex()
+                        : mModel.getCurrentIndex() - 1;
         }
     }
 
     @Override
     public void onAlbumModeSelected(int mode) {
-        if (mode == GalleryActionBar.ALBUM_GRID_MODE_SELECTED) {
+        mGalleryMode = mode;
+        if (mGalleryMode == GalleryActionBar.ALBUM_GRID_MODE_SELECTED) {
             switchToGrid();
         }
     }