summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java8
-rw-r--r--src/com/android/gallery3d/ui/PhotoView.java7
-rw-r--r--src/com/android/gallery3d/ui/SlideshowView.java4
3 files changed, 12 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 6736d35..9cc56cc 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -401,7 +401,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
mParentMediaSetString != null;
GalleryActionBar actionBar = mActivity.getGalleryActionBar();
actionBar.setDisplayOptions(enableHomeButton, false);
- actionBar.enableAlbumModeMenu(GalleryActionBar.ALBUM_GRID_MODE_SELECTED, this);
+ if (!mGetContent) {
+ actionBar.enableAlbumModeMenu(GalleryActionBar.ALBUM_GRID_MODE_SELECTED, this);
+ }
// Set the reload bit here to prevent it exit this page in clearLoadingBit().
setLoadingBit(BIT_LOADING_RELOAD);
@@ -425,7 +427,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
mAlbumDataAdapter.pause();
mAlbumView.pause();
DetailsHelper.pause();
- mActivity.getGalleryActionBar().disableAlbumModeMenu(true);
+ if (!mGetContent) {
+ mActivity.getGalleryActionBar().disableAlbumModeMenu(true);
+ }
if (mSyncTask != null) {
mSyncTask.cancel();
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index a5a15bf..a7357e0 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -1259,10 +1259,11 @@ public class PhotoView extends GLView {
mIgnoreUpEvent = false;
return;
}
- if (!mFilmMode || mHadFling) {
- snapback();
- } else {
+
+ if (mFilmMode && !mHadFling && mFirstScrollX) {
snapToNeighborImage();
+ } else {
+ snapback();
}
}
diff --git a/src/com/android/gallery3d/ui/SlideshowView.java b/src/com/android/gallery3d/ui/SlideshowView.java
index a057bb7..bb36c47 100644
--- a/src/com/android/gallery3d/ui/SlideshowView.java
+++ b/src/com/android/gallery3d/ui/SlideshowView.java
@@ -142,8 +142,8 @@ public class SlideshowView extends GLView {
int viewWidth = getWidth();
int viewHeight = getHeight();
- float initScale = Math.min(2f, Math.min((float)
- viewWidth / mWidth, (float) viewHeight / mHeight));
+ float initScale = Math.min((float)
+ viewWidth / mWidth, (float) viewHeight / mHeight);
float scale = initScale * (1 + SCALE_SPEED * mProgress);
float centerX = viewWidth / 2 + mMovingVector.x * mProgress;