am 0fff5600: am 976b9a3a: Fix showing the wrong image after animation (1c2bfe47) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/filtershow/imageshow/ImageShow.java

+14 −9

Original line number	Diff line number	Diff line
		@@ -366,8 +366,21 @@ public class ImageShow extends View implements OnGestureListener,
		m.mapRect(d);
		d.roundOut(mImageBounds);

		if (master.onGoingNewLookAnimation()) {
		boolean showAnimatedImage = master.onGoingNewLookAnimation();
		if (!showAnimatedImage && mDidStartAnimation) {
		// animation ended, but do we have the correct image to show?
		if (master.getPreset().equals(master.getCurrentPreset())) {
		// we do, let's stop showing the animated image
		mDidStartAnimation = false;
		MasterImage.getImage().resetAnimBitmap();
		} else {
		showAnimatedImage = true;
		}
		} else if (showAnimatedImage) {
		mDidStartAnimation = true;
		}

		if (showAnimatedImage) {
		canvas.save();

		// Animation uses the image before the change
		@@ -472,14 +485,6 @@ public class ImageShow extends View implements OnGestureListener,
		canvas.drawBitmap(image, m, mPaint);
		}

		if (!master.onGoingNewLookAnimation()
		&& mDidStartAnimation
		&& !master.getPreviousPreset().equals(master.getCurrentPreset())) {
		mDidStartAnimation = false;
		MasterImage.getImage().resetAnimBitmap();
		invalidate();
		}

		canvas.restore();
		}

+0 −6

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@ public class MasterImage implements RenderingRequestCaller {
		private Bitmap mPartialBitmap = null;
		private Bitmap mHighresBitmap = null;
		private Bitmap mPreviousImage = null;
		private ImagePreset mPreviousPreset = null;
		private int mShadowMargin = 15; // not scaled, fixed in the asset
		private Rect mPartialBounds = new Rect();

		@@ -366,10 +365,6 @@ public class MasterImage implements RenderingRequestCaller {
		return mPreviousImage;
		}

		public ImagePreset getPreviousPreset() {
		return mPreviousPreset;
		}

		public ImagePreset getCurrentPreset() {
		return getPreviewBuffer().getConsumer().getPreset();
		}
		@@ -426,7 +421,6 @@ public class MasterImage implements RenderingRequestCaller {
		resetAnimBitmap();
		mPreviousImage = mBitmapCache.getBitmapCopy(getFilteredImage(), BitmapCache.NEW_LOOK);
		}
		mPreviousPreset = getPreviewBuffer().getConsumer().getPreset();
		if (newRepresentation instanceof FilterUserPresetRepresentation) {
		mCurrentLookAnimation = CIRCLE_ANIMATION;
		mAnimator = ValueAnimator.ofFloat(0, 1);