2 files changed, 19 insertions, 9 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 73952b0d7..2b99ec510 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2327,7 +2327,11 @@ public class CaptureModule implements CameraModule, PhotoController,
                     if (!mIsSupportedQcfa) {
                         mUI.enableShutter(true);
                     }
-                    mUI.enableVideo(true);
+                    if (mDeepPortraitMode) {
+                        mUI.enableVideo(false);
+                    } else {
+                        mUI.enableVideo(true);
+                    }
                 }
             });
         }
@@ -2914,13 +2918,16 @@ public class CaptureModule implements CameraModule, PhotoController,
             msg.arg1 = cameraId;
             mCameraHandler.sendMessage(msg);
         }
-        if (!mDeepPortraitMode) {
-            mUI.showSurfaceView();
-            mUI.stopDeepPortraitMode();
-        } else {
+        if (mDeepPortraitMode) {
             mUI.startDeepPortraitMode(mPreviewSize);
-            if (mUI.getGLCameraPreview() != null)
+            if (mUI.getGLCameraPreview() != null) {
                 mUI.getGLCameraPreview().onResume();
+            }
+            mUI.enableVideo(false);
+        } else {
+            mUI.showSurfaceView();
+            mUI.stopDeepPortraitMode();
+            mUI.enableVideo(true);
         }
 
         if (!mFirstTimeInitialized) {
@@ -2936,7 +2943,6 @@ public class CaptureModule implements CameraModule, PhotoController,
             }
         });
         mUI.enableShutter(true);
-        mUI.enableVideo(true);
         setProModeVisible();
 
         String scene = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE);
@@ -6018,8 +6024,9 @@ public class CaptureModule implements CameraModule, PhotoController,
         updatePreviewSurfaceReadyState(true);
         mUI.initThumbnail();
         if (getFrameFilters().size() == 0) {
-            Toast.makeText(mActivity, "DeepPortrait is not supported",
-                    Toast.LENGTH_LONG).show();
+            if (mDeepPortraitMode) {
+                Toast.makeText(mActivity, "DeepPortrait is not supported", Toast.LENGTH_LONG).show();
+            }
             return;
         }
         mRenderer = getGLCameraPreview().getRendererInstance();
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index f212eb865..f5fbe2fc4 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -167,6 +167,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         public void surfaceDestroyed(SurfaceHolder holder) {
             Log.v(TAG, "surfaceDestroyed");
             mSurfaceHolder = null;
+            if (mDeepZoomModeRect != null) {
+                mDeepZoomModeRect.setVisibility(View.GONE);
+            }
             previewUIDestroyed();
         }
     };