diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-23 19:22:14 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-23 19:22:14 -0700 |
commit | d5573a6132a1847ef9bdc1892ff8cb550a87adcd (patch) | |
tree | d5f8782fa8c903eefd934ba4888871e46636b62b /src/com/android/camera/ui | |
parent | c520114b3f099ea597bbf2e09c0cc30b6d9adb1b (diff) | |
parent | d95956afef133b3e47c8bc76901ee13b089d55ed (diff) | |
download | android_packages_apps_Snap-d5573a6132a1847ef9bdc1892ff8cb550a87adcd.tar.gz android_packages_apps_Snap-d5573a6132a1847ef9bdc1892ff8cb550a87adcd.tar.bz2 android_packages_apps_Snap-d5573a6132a1847ef9bdc1892ff8cb550a87adcd.zip |
Merge "SnapdragonCamera: fix camera preview broken when resume from gallery"
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index 46267a941..3edb23d3c 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -1273,12 +1273,8 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { return; } - // If the layout changed, we need to adjust the current position so - // that if an item is centered before the change, it's still centered. - if (layoutChanged) { - mViewItem[mCurrentItem].setLeftPosition( - mCenterX - mViewItem[mCurrentItem].getView().getMeasuredWidth() / 2); - } + mViewItem[mCurrentItem].setLeftPosition( + mCenterX - mViewItem[mCurrentItem].getView().getMeasuredWidth() / 2); if (mController.isZoomStarted()) { return; |