summaryrefslogtreecommitdiff
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2009-10-29 19:40:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 19:40:44 -0700
commitcb744bd2ee54f6888c62820897d17b8ab9122dcf (patch)
tree6f20430d8d1c5624c0105665f603600b026fb6f7 /src/com/android/camera
parent8e4b451b899ac13cd313a2e745e509a88bc1e560 (diff)
parentbe2f475fe49538e38753ad391fb3176f9b0d1c69 (diff)
downloadGallery-cb744bd2ee54f6888c62820897d17b8ab9122dcf.tar.gz
am be2f475f: Lift the upperbound of the up-scaling when view image.
Merge commit 'be2f475fe49538e38753ad391fb3176f9b0d1c69' into eclair-mr2 * commit 'be2f475fe49538e38753ad391fb3176f9b0d1c69': Lift the upperbound of the up-scaling when view image.
Diffstat (limited to 'src/com/android/camera')
-rw-r--r--src/com/android/camera/ImageViewTouchBase.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/ImageViewTouchBase.java b/src/com/android/camera/ImageViewTouchBase.java
index 0cab8fc..ef2edeb 100644
--- a/src/com/android/camera/ImageViewTouchBase.java
+++ b/src/com/android/camera/ImageViewTouchBase.java
@@ -267,10 +267,10 @@ abstract class ImageViewTouchBase extends ImageView {
float h = bitmap.getHeight();
matrix.reset();
- // We limit up-scaling to 2x otherwise the result may look bad if it's
+ // We limit up-scaling to 3x otherwise the result may look bad if it's
// a small icon.
- float widthScale = Math.min(viewWidth / w, 2.0f);
- float heightScale = Math.min(viewHeight / h, 2.0f);
+ float widthScale = Math.min(viewWidth / w, 3.0f);
+ float heightScale = Math.min(viewHeight / h, 3.0f);
float scale = Math.min(widthScale, heightScale);
matrix.postConcat(bitmap.getRotateMatrix());