From 03b75411538c60021799ccc7acc8ed4798253b6d Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Mon, 9 Sep 2013 17:26:14 -0700
Subject: Hide zoom view when back is pressed

Bug: 10677244
Change-Id: I2e42d35382dded28bdd47dbdca173a1fd2bf6ac7
---
 src/com/android/camera/ui/FilmStripView.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 607dacf07..808004c89 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -1233,6 +1233,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
         current.resetTransform();
         mController.cancelLoadingZoomedImage();
         mZoomView.setVisibility(GONE);
+        mController.setSurroundingViewsVisible(true);
     }
 
     // Keeps the view in the view hierarchy if it's camera preview.
@@ -2052,6 +2053,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
 
         @Override
         public void goToFirstItem() {
+            resetZoomView();
             // TODO: animate to camera if it is still in the mViewItem buffer
             // versus a full reload which will perform an immediate transition
             reload();
-- 
cgit v1.2.3