diff options
| author | Doris Liu <tianliu@google.com> | 2013-09-10 01:24:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-10 01:24:25 +0000 |
| commit | e074fcbdb7d7bb20dde8173b969cbbafb53b92a9 (patch) | |
| tree | ac894bfca516f50ebd903b1a0bbaac88ef81c52f /src | |
| parent | f8b877c2dd4fed2c962c51d619e2548923888525 (diff) | |
| parent | 03b75411538c60021799ccc7acc8ed4798253b6d (diff) | |
| download | android_packages_apps_Snap-e074fcbdb7d7bb20dde8173b969cbbafb53b92a9.tar.gz android_packages_apps_Snap-e074fcbdb7d7bb20dde8173b969cbbafb53b92a9.tar.bz2 android_packages_apps_Snap-e074fcbdb7d7bb20dde8173b969cbbafb53b92a9.zip | |
Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
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 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(); |