diff options
author | John Hoford <hoford@google.com> | 2013-05-16 17:37:46 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2013-05-17 23:27:40 +0000 |
commit | 3f39318ccd887c83aeaab5d2a882671e1280ecf0 (patch) | |
tree | 4fdc9065df10afaea19668b80dffaf3c3b3afd53 /src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | |
parent | ce54df0c34bd0d8472e2c1fea4da1e0a9d8fd657 (diff) | |
download | android_packages_apps_Snap-3f39318ccd887c83aeaab5d2a882671e1280ecf0.tar.gz android_packages_apps_Snap-3f39318ccd887c83aeaab5d2a882671e1280ecf0.tar.bz2 android_packages_apps_Snap-3f39318ccd887c83aeaab5d2a882671e1280ecf0.zip |
Disable zoom
Bug: 8791729
Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow/MasterImage.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java index 5e5d70b7c..a0b59c0f8 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java +++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java @@ -34,7 +34,7 @@ public class MasterImage implements RenderingRequestCaller { 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 class MasterImage implements RenderingRequestCaller { } public void setScaleFactor(float scaleFactor) { + if (DISABLEZOOM) { + return; + } if (scaleFactor == mScaleFactor) { return; } @@ -461,6 +464,11 @@ public class MasterImage implements RenderingRequestCaller { } 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 class MasterImage implements RenderingRequestCaller { } public void setOriginalTranslation(Point originalTranslation) { + if (DISABLEZOOM) { + return; + } mOriginalTranslation.x = originalTranslation.x; mOriginalTranslation.y = originalTranslation.y; } @@ -490,6 +501,9 @@ public class MasterImage implements RenderingRequestCaller { } public float getMaxScaleFactor() { + if (DISABLEZOOM) { + return 1; + } return mMaxScaleFactor; } |