diff options
| author | Doris Liu <tianliu@google.com> | 2013-09-16 20:22:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-16 20:22:55 +0000 |
| commit | d688c0c31d4287c03b664f6fca5c6498a1e4bd7d (patch) | |
| tree | 6f5d14ee2b622b248b9f256f82ad45140db3a149 | |
| parent | c29156954bcbf0218a78c308c3ba8f25e00aeecc (diff) | |
| parent | 79dcb12bbbcb9b3650ace5290897e26451218fe1 (diff) | |
| download | android_packages_apps_Snap-d688c0c31d4287c03b664f6fca5c6498a1e4bd7d.tar.gz android_packages_apps_Snap-d688c0c31d4287c03b664f6fca5c6498a1e4bd7d.tar.bz2 android_packages_apps_Snap-d688c0c31d4287c03b664f6fca5c6498a1e4bd7d.zip | |
Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 4 |
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; } |