Merge "Disable zoom" into gb-ub-photos-bryce
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 5e5d70b..a0b59c0 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -34,7 +34,7 @@
private static final String LOGTAG = "MasterImage";
private boolean DEBUG = false;
-
+ private static final boolean DISABLEZOOM = true;
private static MasterImage sMasterImage = null;
private static int sIconSeedSize = 128;
private static float sHistoryPreviewSize = 128.0f;
@@ -449,6 +449,9 @@
}
public void setScaleFactor(float scaleFactor) {
+ if (DISABLEZOOM) {
+ return;
+ }
if (scaleFactor == mScaleFactor) {
return;
}
@@ -461,6 +464,11 @@
}
public void setTranslation(Point translation) {
+ if (DISABLEZOOM) {
+ mTranslation.x = 0;
+ mTranslation.y = 0;
+ return;
+ }
mTranslation.x = translation.x;
mTranslation.y = translation.y;
needsUpdatePartialPreview();
@@ -471,6 +479,9 @@
}
public void setOriginalTranslation(Point originalTranslation) {
+ if (DISABLEZOOM) {
+ return;
+ }
mOriginalTranslation.x = originalTranslation.x;
mOriginalTranslation.y = originalTranslation.y;
}
@@ -490,6 +501,9 @@
}
public float getMaxScaleFactor() {
+ if (DISABLEZOOM) {
+ return 1;
+ }
return mMaxScaleFactor;
}
