From bcec1d75de1471623c8efdbaddaa8c76dc379b96 Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Mon, 17 Sep 2012 14:30:46 -0700 Subject: [PATCH] Don't switch back to fullscreen camera when flinging Bug: 7145903 Bug: 7050303 It was very annoying to users to fling in the filmstrip and end up in the fullscreen camera mode, so disabling that. Long-term, we want to be smarter about this and do the zoom to the full-screen if it's a short swipe rather than a fling. Change-Id: I40ac4848a267c06fc41e161a7a292b8f03b2ef4c --- src/com/android/gallery3d/ui/PhotoView.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java index 68dc152e6..c47bccc27 100644 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -635,9 +635,13 @@ public class PhotoView extends GLView { } else if (isCenter && mNeedToChangeToFilmstripWhenCentered) { setFilmMode(true); mNeedToChangeToFilmstripWhenCentered = false; - } else if (!mWasCameraCenter && isCameraCenter && mFilmMode) { + } + /* + TODO: Come out of film mode if it was a short swipe rather than a fling + else if (!mWasCameraCenter && isCameraCenter && mFilmMode) { setFilmMode(false); } + */ if (isCameraCenter && !mFilmMode) { // Move into camera in page mode, lock -- 2.11.0