From e1d5ba4fc5470043e8645984e3018b712f5dfcff Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Tue, 10 Sep 2013 12:44:20 -0700
Subject: Hide zoom view when going to full screen

Bug: 10654903

Change-Id: Ibeed1e02e203dffc4aba69a52b748206a734294f
---
 src/com/android/camera/ui/FilmStripView.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index d20d85e4b..33437f250 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -2142,6 +2142,9 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             if (current == null) {
                 return false;
             }
+            if (mController.isScrolling()) {
+                mController.stopScrolling();
+            }
             mController.zoomAt(current, x, y);
             return false;
         }
@@ -2155,6 +2158,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             // the lower-res image during a gesture to ensure a responsive experience.
             // TODO: Delay this until gesture starts.
             if (mController.isZoomStarted()) {
+                mController.cancelLoadingZoomedImage();
                 mZoomView.setVisibility(GONE);
             }
             return true;
@@ -2319,7 +2323,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
 
         @Override
         public boolean onScaleBegin(float focusX, float focusY) {
-            mController.cancelLoadingZoomedImage();
             if (inCameraFullscreen()) {
                 return false;
             }
@@ -2384,8 +2387,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             } else if (mScaleTrend > 1f || mScale > FULL_SCREEN_SCALE - TOLERANCE) {
                 if (mController.isZoomStarted()) {
                     mScale = FULL_SCREEN_SCALE;
-                    mViewItem[mCurrentItem].updateTransform(0f, 0f, 1f, 1f, mDrawArea.width(),
-                            mDrawArea.height());
+                    resetZoomView();
                 }
                 mController.goToFullScreen();
             } else {
-- 
cgit v1.2.3