diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index cd8b80259..cfc9aa0ed 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -295,19 +295,19 @@ public class PhotoPage extends ActivityState implements } case MSG_ON_CAMERA_CENTER: { mSkipUpdateCurrentPhoto = false; - boolean updateNeeded = false; + boolean stayedOnCamera = false; if (!mPhotoView.getFilmMode()) { - lockOrientation(); - updateNeeded = true; + stayedOnCamera = true; } else if (SystemClock.uptimeMillis() < mCameraSwitchCutoff && mMediaSet.getMediaItemCount() > 1) { mPhotoView.switchToImage(1); } else { mPhotoView.setFilmMode(false); - updateNeeded = true; + stayedOnCamera = true; } - if (updateNeeded) { + if (stayedOnCamera) { + lockOrientation(); updateBars(); updateCurrentPhoto(mModel.getMediaItem(0)); } @@ -444,7 +444,7 @@ public class PhotoPage extends ActivityState implements mCameraSwitchCutoff = SystemClock.uptimeMillis() + CAMERA_SWITCH_CUTOFF_THRESHOLD_MS; mPhotoView.stopScrolling(); - } else if (oldIndex == 1 && mCurrentIndex == 0) { + } else if (oldIndex >= 1 && mCurrentIndex == 0) { mPhotoView.setWantPictureCenterCallbacks(true); mSkipUpdateCurrentPhoto = true; } |