diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-01-09 02:03:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-01-09 02:03:03 -0800 |
| commit | 627ec7981309b3a91d20fb321112bf74a46e5b61 (patch) | |
| tree | 6ed6f950a4a69960cfd7197bde2b10f6c146f0d9 | |
| parent | 0a89cf94d4862ea658f18c1be083fe324da14528 (diff) | |
| parent | 1d7f2f20d6c20e826809f463363206d85555123e (diff) | |
| download | android_packages_apps_Snap-627ec7981309b3a91d20fb321112bf74a46e5b61.tar.gz android_packages_apps_Snap-627ec7981309b3a91d20fb321112bf74a46e5b61.tar.bz2 android_packages_apps_Snap-627ec7981309b3a91d20fb321112bf74a46e5b61.zip | |
Merge "Camcorder: Switch video torch when preview focused"
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 |