diff options
| author | ztenghui <ztenghui@google.com> | 2013-09-09 14:58:44 -0700 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2013-09-11 17:12:24 -0700 |
| commit | 7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e (patch) | |
| tree | 8c70ed32155287e4f023af0df1af439688188eed /src/com/android/camera/PhotoModule.java | |
| parent | 20703f72e087a01e6a589c2875819cf817581a51 (diff) | |
| download | android_packages_apps_Snap-7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e.tar.gz android_packages_apps_Snap-7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e.tar.bz2 android_packages_apps_Snap-7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e.zip | |
Fix the flash mode transition in video mode
onSwitchMode is wrongly overloaded, now is fixed.
Basically, onCurrentDataChanged will handle the switching in and out of Camera.
onDataFullScreenChange will handle full screen change on non-preview data.
bug:10610967
Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8e03131c4..789446dcd 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -406,6 +406,7 @@ public class PhotoModule mUI.showLocationDialog(); } + @Override public void enableRecordingLocation(boolean enable) { setLocationPreference(enable ? RecordLocationPreference.VALUE_ON : RecordLocationPreference.VALUE_OFF); @@ -505,6 +506,7 @@ public class PhotoModule } + @Override public void onScreenSizeChanged(int width, int height, int previewWidth, int previewHeight) { if (mFocusManager != null) mFocusManager.setPreviewSize(width, height); } @@ -1160,10 +1162,6 @@ public class PhotoModule } @Override - public void updateCameraAppView() { - } - - @Override public void onResumeBeforeSuper() { mPaused = false; } @@ -1768,6 +1766,7 @@ public class PhotoModule } } + @Override public boolean isCameraIdle() { return (mCameraState == IDLE) || (mCameraState == PREVIEW_STOPPED) || @@ -1775,6 +1774,7 @@ public class PhotoModule && (mCameraState != SWITCHING_CAMERA)); } + @Override public boolean isImageCaptureIntent() { String action = mActivity.getIntent().getAction(); return (MediaStore.ACTION_IMAGE_CAPTURE.equals(action) @@ -1941,8 +1941,8 @@ public class PhotoModule } @Override - public void onSwitchMode(boolean toCamera) { - mUI.onSwitchMode(toCamera); + public void onPreviewFocusChanged(boolean previewFocused) { + mUI.onPreviewFocusChanged(previewFocused); } /* Below is no longer needed, except to get rid of compile error |