summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/CropView.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher3/CropView.java')
-rw-r--r--src/com/android/launcher3/CropView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CropView.java b/src/com/android/launcher3/CropView.java
index 9224e3bb2..578b8eafd 100644
--- a/src/com/android/launcher3/CropView.java
+++ b/src/com/android/launcher3/CropView.java
@@ -165,7 +165,8 @@ public class CropView extends TiledImageView implements OnScaleGestureListener {
final float imageWidth = imageDims[0];
final float imageHeight = imageDims[1];
mMinScale = Math.max(w / imageWidth, h / imageHeight);
- mRenderer.scale = Math.max(mMinScale, mRenderer.scale);
+ mRenderer.scale =
+ Math.max(mMinScale, resetScale ? Float.MIN_VALUE : mRenderer.scale);
}
}
}