commit 56e44af257d65d730f04d1e90c87f5674abd7f26
author ztenghui <ztenghui@google.com> Tue Oct 15 15:31:00 2013 -0700
committer ztenghui <ztenghui@google.com> Mon Oct 21 10:27:55 2013 -0700
tree 68360ebbdebaaa0c6f83ef6c7191f9932fcdc88a
parent 891a80756166a8621f063c727000c9a943cf5465

Don't call onCurrentDataChanged for CameraPreview when reloading.

In this case, camera preview didn't change, so there is no need to call
onCurrentDataChanged.

bug:11237255
Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282

src/com/android/camera/ui/FilmStripView.java

diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 564dd5d..c95f07c 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -1906,10 +1906,19 @@
         mController.stopScrolling(true);
         mController.stopScale();
         mDataIdOnUserScrolling = 0;
-        // Remove all views from the mViewItem buffer, except the camera view.
+        // Reload has a side effect that after this call, it will show the
+        // camera preview. So we want to know whether it starts from the camera
+        // preview to decide whether we need to call onDataFocusChanged.
+        boolean stayInPreview = false;
+
         if (mListener != null && mViewItem[mCurrentItem] != null) {
-            mListener.onDataFocusChanged(mViewItem[mCurrentItem].getId(), false);
+            stayInPreview = mViewItem[mCurrentItem].getId() == 0;
+            if (!stayInPreview) {
+                mListener.onDataFocusChanged(mViewItem[mCurrentItem].getId(), false);
+            }
         }
+
+        // Remove all views from the mViewItem buffer, except the camera view.
         for (int i = 0; i < mViewItem.length; i++) {
             if (mViewItem[i] == null) {
                 continue;
@@ -1950,7 +1959,9 @@
 
         if (mListener != null) {
             mListener.onReload();
-            mListener.onDataFocusChanged(mViewItem[mCurrentItem].getId(), true);
+            if (!stayInPreview) {
+                mListener.onDataFocusChanged(mViewItem[mCurrentItem].getId(), true);
+            }
         }
     }