Add pinch to zoom

Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a

1 files changed, 35 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 3172c79dc..905d2c390 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -17,6 +17,7 @@
 package com.android.gallery3d.filtershow.imageshow;
 
 import android.graphics.Bitmap;
+import android.graphics.Point;
 import android.graphics.RectF;
 
 import com.android.gallery3d.filtershow.FilterShowActivity;
@@ -57,6 +58,10 @@ public class MasterImage implements RenderingRequestCaller {
 
     private GeometryMetadata mPreviousGeometry = null;
 
+    private float mScaleFactor = 1.0f;
+    private Point mTranslation = new Point();
+    private Point mOriginalTranslation = new Point();
+
     private MasterImage() {
     }
 
@@ -263,4 +268,34 @@ public class MasterImage implements RenderingRequestCaller {
             listener.geometryChanged();
         }
     }
+
+    public float getScaleFactor() {
+        return mScaleFactor;
+    }
+
+    public void setScaleFactor(float scaleFactor) {
+        mScaleFactor = scaleFactor;
+    }
+
+    public Point getTranslation() {
+        return mTranslation;
+    }
+
+    public void setTranslation(Point translation) {
+        mTranslation = translation;
+    }
+
+    public Point getOriginalTranslation() {
+        return mOriginalTranslation;
+    }
+
+    public void setOriginalTranslation(Point originalTranslation) {
+        mOriginalTranslation.x = originalTranslation.x;
+        mOriginalTranslation.y = originalTranslation.y;
+    }
+
+    public void resetTranslation() {
+        mTranslation.x = 0;
+        mTranslation.y = 0;
+    }
 }