Merge "Fix double-tap behaviour" into gb-ub-photos-bryce (5997a013) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/filtershow/cache/RenderingRequest.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ public class RenderingRequest {
		private ImagePreset mImagePreset = null;
		private ImagePreset mOriginalImagePreset = null;
		private RenderingRequestCaller mCaller = null;
		private float mScaleFactor = 1.0f;
		private Rect mBounds = null;
		private Rect mDestination = null;
		private int mType = FULL_RENDERING;
		@@ -70,6 +71,7 @@ public class RenderingRequest {
		ImagePreset passedPreset = new ImagePreset(preset);
		passedPreset.setImageLoader(MasterImage.getImage().getImageLoader());
		request.setOriginalImagePreset(preset);
		request.setScaleFactor(MasterImage.getImage().getScaleFactor());

		if (type == PARTIAL_RENDERING) {
		request.setBounds(bounds);
		@@ -139,6 +141,14 @@ public class RenderingRequest {
		mBounds = bounds;
		}

		public void setScaleFactor(float scaleFactor) {
		mScaleFactor = scaleFactor;
		}

		public float getScaleFactor() {
		return mScaleFactor;
		}

		public Rect getDestination() {
		return mDestination;
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -397,7 +397,8 @@ public class MasterImage implements RenderingRequestCaller {
		if (request.getType() == RenderingRequest.FILTERS_RENDERING) {
		mFiltersOnlyBitmap = request.getBitmap();
		}
		if (request.getType() == RenderingRequest.PARTIAL_RENDERING) {
		if (request.getType() == RenderingRequest.PARTIAL_RENDERING
		&& request.getScaleFactor() == getScaleFactor()) {
		mPartialBitmap = request.getBitmap();
		notifyObservers();
		}