diff options
| author | Doris Liu <tianliu@google.com> | 2013-09-10 16:48:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-10 16:48:32 -0700 |
| commit | 005fbbbcf6afe3f2dcb268115f4fe04ecd19cfd2 (patch) | |
| tree | eb6e1e38dd6288fc61f9b83119f49434321e9971 | |
| parent | eff820b2de7824ba82d310e1706800e4d34e41cc (diff) | |
| parent | e1d5ba4fc5470043e8645984e3018b712f5dfcff (diff) | |
| download | android_packages_apps_Snap-005fbbbcf6afe3f2dcb268115f4fe04ecd19cfd2.tar.gz android_packages_apps_Snap-005fbbbcf6afe3f2dcb268115f4fe04ecd19cfd2.tar.bz2 android_packages_apps_Snap-005fbbbcf6afe3f2dcb268115f4fe04ecd19cfd2.zip | |
am e1d5ba4f: Hide zoom view when going to full screen
* commit 'e1d5ba4fc5470043e8645984e3018b712f5dfcff':
Hide zoom view when going to full screen
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 8 |
1 files changed, 5 insertions, 3 deletions
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 { |