summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/ui/FilmStripView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 64f8a69d4..abb2a84e5 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -2392,7 +2392,9 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
return false;
}
mScaleTrend = 1f;
- mMaxScale = mController.getCurrentDataMaxScale();
+ // If the image is smaller than screen size, we should allow to zoom
+ // in to full screen size
+ mMaxScale = Math.max(mController.getCurrentDataMaxScale(), FULL_SCREEN_SCALE);
return true;
}