From 8f8b9fc945bfdc220fe6643a5d21e213b5f8cc8c Mon Sep 17 00:00:00 2001
From: Byunghun Jeon <bjeon@codeaurora.org>
Date: Fri, 6 Mar 2015 15:12:57 -0800
Subject: SnapdragonCamera: Fix preview broken when coming back from gallery

Fix preview broken when user goes to gallery using thumbnail in
portrait, rotates to landscape in gallery and back key to come
back to camera

Change-Id: Ib9a8ce69bfbb85573cae55da79901705f726cc22
CRs-Fixed: 802169
---
 src/com/android/camera/ui/FilmStripView.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/com/android/camera/ui')

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();
 
-- 
cgit v1.2.3