diff options
author | John Hoford <hoford@google.com> | 2013-05-20 07:45:30 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-20 07:45:30 -0700 |
commit | 112c7fee94a3f31f85fa44ada54274652f1f2596 (patch) | |
tree | 7f1b2c0c222c4b6222c79530962bbf939a7531a1 /src/com/android | |
parent | e6359c7e2de8ca3fdee7ef36c0830212bd58a805 (diff) | |
parent | 22fcfeb20d601ca73dcfa374a46d3b370bef1929 (diff) | |
download | android_packages_apps_Gallery2-112c7fee94a3f31f85fa44ada54274652f1f2596.tar.gz android_packages_apps_Gallery2-112c7fee94a3f31f85fa44ada54274652f1f2596.tar.bz2 android_packages_apps_Gallery2-112c7fee94a3f31f85fa44ada54274652f1f2596.zip |
am 22fcfeb2: am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce
* commit '22fcfeb20d601ca73dcfa374a46d3b370bef1929':
Disable zoom
Diffstat (limited to 'src/com/android')
-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; } |