diff options
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index 955b904bf..fc1970441 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -1700,10 +1700,14 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { if (reporter.isDataUpdated(dataId)) { updateViewItem(mCurrentItem); final ImageData data = mDataAdapter.getImageData(dataId); - int[] dim = calculateChildDimension( - data.getWidth(), data.getHeight(), - getMeasuredWidth(), getMeasuredHeight()); - mCenterX = curr.getLeftPosition() + dim[0] / 2; + if (!mIsUserScrolling && !mController.isScrolling()) { + // If there is no scrolling at all, adjust mCenterX to place + // the current item at the center. + int[] dim = calculateChildDimension( + data.getWidth(), data.getHeight(), + getMeasuredWidth(), getMeasuredHeight()); + mCenterX = curr.getLeftPosition() + dim[0] / 2; + } } // Check left |