diff options
| author | Doris Liu <tianliu@google.com> | 2013-09-09 18:25:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-09 18:25:18 -0700 |
| commit | 66cfdf11508addf60891c00f4f0752fb90cfe5fb (patch) | |
| tree | 676e417d28b5658797131d57404d3625d3c80419 | |
| parent | db0ea49051523552af59f1b336a4163b843908d8 (diff) | |
| parent | e074fcbdb7d7bb20dde8173b969cbbafb53b92a9 (diff) | |
| download | android_packages_apps_Snap-66cfdf11508addf60891c00f4f0752fb90cfe5fb.tar.gz android_packages_apps_Snap-66cfdf11508addf60891c00f4f0752fb90cfe5fb.tar.bz2 android_packages_apps_Snap-66cfdf11508addf60891c00f4f0752fb90cfe5fb.zip | |
am e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
* commit 'e074fcbdb7d7bb20dde8173b969cbbafb53b92a9':
Hide zoom view when back is pressed
| -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 17fbc7fb8..6398e77a2 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -1234,6 +1234,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. @@ -2053,6 +2054,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(); |