From 79dcb12bbbcb9b3650ace5290897e26451218fe1 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Mon, 16 Sep 2013 12:21:21 -0700
Subject: Fix flicker when zooming images smaller than screen

Bug: 10733300
Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2
---
 src/com/android/camera/ui/FilmStripView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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;
         }
 
-- 
cgit v1.2.3