diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-13 16:32:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-13 16:32:15 -0700 |
| commit | 1d373ecbf3276891a0d2d27a9f3eb736941046ad (patch) | |
| tree | 1fb7baf0dab1e46b0741ba364cab87d9c45705a9 /src | |
| parent | af986037f31c2925c1d2295d16738b9fc9532b83 (diff) | |
| parent | 8f8b9fc945bfdc220fe6643a5d21e213b5f8cc8c (diff) | |
| download | android_packages_apps_Snap-1d373ecbf3276891a0d2d27a9f3eb736941046ad.tar.gz android_packages_apps_Snap-1d373ecbf3276891a0d2d27a9f3eb736941046ad.tar.bz2 android_packages_apps_Snap-1d373ecbf3276891a0d2d27a9f3eb736941046ad.zip | |
Merge "SnapdragonCamera: Fix preview broken when coming back from gallery"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index 3f1029ed1..46267a941 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -107,6 +107,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { private boolean mSendToMenu; private boolean mReset; private boolean mIsLoaded = false; + private boolean initialClampX = false; /** * Common interface for all images in the filmstrip. @@ -994,7 +995,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { } boolean stopScroll = false; - if (curr.getId() == 0 && mCenterX < curr.getCenterX() + if (curr.getId() == 0 && (mCenterX < curr.getCenterX() || initialClampX) && mDataIdOnUserScrolling <= 1) { // Stop at the first ViewItem. stopScroll = true; @@ -1786,7 +1787,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { if (!inFullScreen() || mController.isScrolling()) { return true; } - + initialClampX = false; if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) { mCheckToIntercept = true; mDown = MotionEvent.obtain(ev); @@ -2076,7 +2077,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { // center of the display upon a reload. mCenterX = -1; mScale = FULL_SCREEN_SCALE; - + initialClampX = true; adjustChildZOrder(); invalidate(); |