diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-09-17 14:30:46 -0700 |
|---|---|---|
| committer | Bobby Georgescu <georgescu@google.com> | 2012-09-17 15:14:48 -0700 |
| commit | bcec1d75de1471623c8efdbaddaa8c76dc379b96 (patch) | |
| tree | 09db8777c073f3fb5dd646575921a9d5b9b928b1 /src | |
| parent | 5d54be7c82a3534cb921c9128677f9f299bf01ff (diff) | |
| download | android_packages_apps_Snap-bcec1d75de1471623c8efdbaddaa8c76dc379b96.tar.gz android_packages_apps_Snap-bcec1d75de1471623c8efdbaddaa8c76dc379b96.tar.bz2 android_packages_apps_Snap-bcec1d75de1471623c8efdbaddaa8c76dc379b96.zip | |
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
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 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 |