commit 77fc9f7bd9c94ed673d847b71d681c14c3f07177
author Linux Build Service Account <lnxbuild@localhost> Wed Nov 13 02:45:10 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 13 02:45:10 2013 -0800
tree 36df9e8536cf9681c891b4a729a24595eab2861d
parent fde1599b02dfcb13848925c8d9adf4e40fdb1334
parent 78702747af5973d352d9b166e040ad037882c45d

Merge "Do not enable filmstrip swipe during recording."

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 3106a48..3086fc8 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1098,6 +1098,9 @@
 
         mLocalImagesObserver.setActivityPaused(true);
         mLocalVideosObserver.setActivityPaused(true);
+        if (mFilmStripView.inCameraFullscreen()) {
+            mFilmStripView.getController().clearSurfaceViews();
+        }
     }
 
     @Override

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 31b9e8b..b737cf2 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1074,6 +1074,9 @@
                     }
                 });
             }
+            if (mSnapshotMode == CameraInfo.CAMERA_SUPPORT_MODE_ZSL) {
+                cancelAutoFocus();
+            }
         }
     }
     private OnSeekBarChangeListener mSeekListener = new OnSeekBarChangeListener() {

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 074f80b..d2695b5 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -408,6 +408,8 @@
         public void goToFilmStrip();
 
         public void goToFullScreen();
+
+        public void clearSurfaceViews();
     }
 
     /**
@@ -2330,6 +2332,19 @@
             scaleTo(1f, GEOMETRY_ADJUST_TIME_MS);
         }
 
+        @Override
+        public void clearSurfaceViews() {
+            for(ViewItem item: mViewItem) {
+                if (item == null) {
+                    continue;
+                }
+                View v = item.getView();
+                if (v != mCameraView) {
+                    removeView(v);
+                }
+            }
+        }
+
         private void cancelFlingAnimation() {
             // Cancels flinging for zoomed images
             if (isFlingAnimationRunning()) {