commit 7a447b30f6f58445bfa040958a9fa5f392296aaa
author Jean-Baptiste Queru <jbq@google.com> Wed Oct 03 15:28:18 2012 -0700
committer Jean-Baptiste Queru <jbq@google.com> Wed Oct 03 15:28:20 2012 -0700
tree 1467f59e4da6ed6c9b1eb5417d2edf3694ebae5d
parent 2f4c73d9995158522bd18db125232838afd099e8
parent e311bb72205569675f36784ad67d5bd950a944b8

Reconcile with jb-dev - do not merge

Change-Id: Icd05cc41786c59d592e51e5e0b7a4296a4a1cf57

src/com/android/gallery3d/ui/PhotoView.java

diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index e44905d..821032b 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -916,8 +916,6 @@
         private boolean mModeChanged;
         // If this scaling gesture should be ignored.
         private boolean mIgnoreScalingGesture;
-        // If we have seen a scaling gesture.
-        private boolean mSeenScaling;
         // whether the down action happened while the view is scrolling.
         private boolean mDownInScrolling;
         // If we should ignore all gestures other than onSingleTapUp.
@@ -1022,7 +1020,7 @@
         @Override
         public boolean onFling(float velocityX, float velocityY) {
             if (mIgnoreSwipingGesture) return true;
-            if (mSeenScaling) return true;
+            if (mModeChanged) return true;
             if (swipeImages(velocityX, velocityY)) {
                 mIgnoreUpEvent = true;
             } else {
@@ -1094,8 +1092,6 @@
             // mode and at minimal scale.
             mCanChangeMode = mFilmMode
                     || mPositionController.isAtMinimalScale();
-            mModeChanged = false;
-            mSeenScaling = true;
             mAccScale = 1f;
             return true;
         }
@@ -1172,7 +1168,7 @@
             checkHideUndoBar(UNDO_BAR_TOUCHED);
 
             mDeltaY = 0;
-            mSeenScaling = false;
+            mModeChanged = false;
 
             if (mIgnoreSwipingGesture) return;