diff options
| author | Doris Liu <tianliu@google.com> | 2013-09-09 17:26:14 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-09-09 18:08:40 -0700 |
| commit | 03b75411538c60021799ccc7acc8ed4798253b6d (patch) | |
| tree | d49ccc56e9ade3bb437e564cb8e75dc0286c7204 /src | |
| parent | a71946012df0eee8fe4859a22da3c56feba0344e (diff) | |
| download | android_packages_apps_Snap-03b75411538c60021799ccc7acc8ed4798253b6d.tar.gz android_packages_apps_Snap-03b75411538c60021799ccc7acc8ed4798253b6d.tar.bz2 android_packages_apps_Snap-03b75411538c60021799ccc7acc8ed4798253b6d.zip | |
Hide zoom view when back is pressed
Bug: 10677244
Change-Id: I2e42d35382dded28bdd47dbdca173a1fd2bf6ac7
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 2 |
1 files changed, 2 insertions, 0 deletions
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(); |