diff options
| author | Doris Liu <tianliu@google.com> | 2013-09-16 12:21:21 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-09-16 12:21:21 -0700 |
| commit | 79dcb12bbbcb9b3650ace5290897e26451218fe1 (patch) | |
| tree | 315b53fd81b1b56c9136ce77209c856a20a41cfc | |
| parent | 44974d4b8014ec1f3c8ef1b9d77aae990bbba821 (diff) | |
| download | android_packages_apps_Snap-79dcb12bbbcb9b3650ace5290897e26451218fe1.tar.gz android_packages_apps_Snap-79dcb12bbbcb9b3650ace5290897e26451218fe1.tar.bz2 android_packages_apps_Snap-79dcb12bbbcb9b3650ace5290897e26451218fe1.zip | |
Fix flicker when zooming images smaller than screen
Bug: 10733300
Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2
| -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; } |