From 6720175dbb1817e8dd35a747d43660697084a386 Mon Sep 17 00:00:00 2001
From: Yuli Huang <yuli@google.com>
Date: Thu, 8 Mar 2012 19:11:54 +0800
Subject: Fix b/5948180: Photo is repositioned during being scaled.

Avoid repositioning photo to center vertically during scaling it.

Change-Id: Id9f2de6b2b1611419a0c03888cff49a5336b39df
---
 src/com/android/gallery3d/ui/PositionController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com/android/gallery3d/ui/PositionController.java')

diff --git a/src/com/android/gallery3d/ui/PositionController.java b/src/com/android/gallery3d/ui/PositionController.java
index b9efb743e..9464ba6d9 100644
--- a/src/com/android/gallery3d/ui/PositionController.java
+++ b/src/com/android/gallery3d/ui/PositionController.java
@@ -419,7 +419,7 @@ class PositionController {
         // force it to be in the center.
         // (We do for height only, not width, because the user may
         // want to scroll to the previous/next image.)
-        if (viewHigherThanScaledImage(mToScale)) {
+        if (!mInScale && viewHigherThanScaledImage(mToScale)) {
             mToY = mImageH / 2;
         }
 
-- 
cgit v1.2.3