diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-09-11 12:37:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-11 12:37:45 -0700 |
| commit | 3a6b33e50aa999d7c1b149a29bf8697d39e21489 (patch) | |
| tree | a4214a57c52400dbc656ca70bffbebd4a9e3847a /src | |
| parent | 92fe93cc3ca759f488f82137fcb4476edfe1cf85 (diff) | |
| parent | 9c4cf6d5c9d0ced9a19819e31392ecca0a754649 (diff) | |
| download | android_packages_apps_Snap-3a6b33e50aa999d7c1b149a29bf8697d39e21489.tar.gz android_packages_apps_Snap-3a6b33e50aa999d7c1b149a29bf8697d39e21489.tar.bz2 android_packages_apps_Snap-3a6b33e50aa999d7c1b149a29bf8697d39e21489.zip | |
Merge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/ui/PhotoView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java index c31546b6b..68dc152e6 100644 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -612,6 +612,7 @@ public class PhotoView extends GLView { mSize.height = getRotated(mRotation, h, w); } + private boolean mNeedToChangeToFilmstripWhenCentered = false; @Override public void draw(GLCanvas canvas, Rect r) { drawTileView(canvas, r); @@ -629,8 +630,11 @@ public class PhotoView extends GLView { boolean isCameraCenter = mIsCamera && isCenter && !canUndoLastPicture(); if (mWasCameraCenter && mIsCamera && !isCenter && !mFilmMode) { - // Temporary disabled to de-emphasize filmstrip. + setFilmMode(false); + mNeedToChangeToFilmstripWhenCentered = true; + } else if (isCenter && mNeedToChangeToFilmstripWhenCentered) { setFilmMode(true); + mNeedToChangeToFilmstripWhenCentered = false; } else if (!mWasCameraCenter && isCameraCenter && mFilmMode) { setFilmMode(false); } |