Merge "Fix double-tap behaviour" into gb-ub-photos-bryce

2 files changed, 12 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/filtershow/cache/RenderingRequest.java b/src/com/android/gallery3d/filtershow/cache/RenderingRequest.java
index 8e7c3e195..3416ddfc2 100644
--- a/src/com/android/gallery3d/filtershow/cache/RenderingRequest.java
+++ b/src/com/android/gallery3d/filtershow/cache/RenderingRequest.java
@@ -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;
     }
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index c4d5a0677..94573bc61 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -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();
         }