Commit 87df906d authored Oct 12, 2013 by kaiyiz Committed by Gerrit - the friendly Code Review server Jan 24, 2016

Gallery2: Fix the superposition of two images issue

When we zoom out to film mode from single photo mode with more than two
fingers, PhotoView will receive multi onScaleBegin/onScaleEnd streams.
But when mModeChanged is true, it will only notify PositionController to
beginScale but not to endScale, then mInScale remains in true state. So
when we back to single photo mode from film mode, focuse photo can't do
scale animation in Box.startSnapback().

According to the logic in onScaleEnd(), we will ignore other scale begin
notification if film mode has been changed.

CRs-Fixed: 551984

Change-Id: I468d932adab0a3540f107501db4d0ea4b7ffbb10

parent 7e72c64a

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1180,6 +1180,8 @@ public class PhotoView extends GLView {
		if (mIgnoreScalingGesture) {
		return true;
		}
		// We ignore other scale begin notification if film mode has been changed.
		if (mModeChanged) return true;
		mPositionController.beginScale(focusX, focusY);
		// We can change mode if we are in film mode, or we are in page
		// mode and at minimal scale.