From 1d7f2f20d6c20e826809f463363206d85555123e Mon Sep 17 00:00:00 2001
From: Vladimir Petrov <vpetro@codeaurora.org>
Date: Fri, 13 Dec 2013 18:15:14 +0200
Subject: Camcorder: Switch video torch when preview focused

- Currently, video torch switching is not determined
  properly. When user enables and disables flash mode
  checkbox, nothing happens. Also, if video torch
  is enabled and switching to Camera and back to
  Camcorder mode, torch doesn't lights up.

- Adding a local variable mPreviewFocused to track
  the preview window focus state should fix the issue.

Change-Id: Ia134b86885eda1ad50d510e67e5595a391326d10
CRs-fixed: 567295
---
 src/com/android/camera/VideoModule.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 2886b5fb7..1847df80f 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -182,6 +182,8 @@ public class VideoModule implements CameraModule,
     private boolean mStartPrevPending = false;
     private boolean mStopPrevPending = false;
 
+    // The preview window is on focus
+    private boolean mPreviewFocused = false;
 
     private final MediaSaveService.OnMediaSavedListener mOnVideoSavedListener =
             new MediaSaveService.OnMediaSavedListener() {
@@ -225,6 +227,7 @@ public class VideoModule implements CameraModule,
             return;
         }
         mParameters = mCameraDevice.getParameters();
+        mPreviewFocused = true;
     }
 
     //QCOM data Members Starts here
@@ -960,6 +963,7 @@ public class VideoModule implements CameraModule,
         mCameraDevice = null;
         mPreviewing = false;
         mSnapshotInProgress = false;
+        mPreviewFocused = false;
     }
 
     private void releasePreviewResources() {
@@ -1852,7 +1856,7 @@ public class VideoModule implements CameraModule,
             mParameters.setPreviewFrameRate(mProfile.videoFrameRate);
         }
 
-        forceFlashOffIfSupported(!mUI.isVisible());
+        forceFlashOffIfSupported(!mPreviewFocused);
         videoWidth = mProfile.videoFrameWidth;
         videoHeight = mProfile.videoFrameHeight;
         String recordSize = videoWidth + "x" + videoHeight;
@@ -2091,6 +2095,7 @@ public class VideoModule implements CameraModule,
     public void onPreviewFocusChanged(boolean previewFocused) {
         mUI.onPreviewFocusChanged(previewFocused);
         forceFlashOff(!previewFocused);
+        mPreviewFocused = previewFocused;
     }
 
     @Override
-- 
cgit v1.2.3