diff options
| author | Alok Kediya <kediya@codeaurora.org> | 2013-09-27 20:22:45 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:18 -0600 |
| commit | 0dc64ffddb06d0b41e65f10c742caec52e8b0436 (patch) | |
| tree | 43344ecae06fa3aa8b2384d6208175f514965017 /src/com/android/camera/AndroidCameraManagerImpl.java | |
| parent | 5213f27da56b6b1ff989ea9eda28bac7dce720b5 (diff) | |
| download | android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.tar.gz android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.tar.bz2 android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.zip | |
Camera : Enable camera and camcorder UI features..
Added keys and APIs for enabling QC features from UI.
(cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21)
Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/PhotoMenu.java
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/VideoModule.java
(cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376)
(cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
Diffstat (limited to 'src/com/android/camera/AndroidCameraManagerImpl.java')
| -rw-r--r-- | src/com/android/camera/AndroidCameraManagerImpl.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index d9e21fdd0..84dc0a8de 100644 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -39,6 +39,8 @@ import android.os.Looper; import android.os.Message; import android.util.Log; import android.view.SurfaceHolder; +import android.hardware.Camera.CameraDataCallback; +import com.android.camera.util.ApiHelper; /** * A class to implement {@link CameraManager} of the Android camera framework. @@ -83,6 +85,9 @@ class AndroidCameraManagerImpl implements CameraManager { // Presentation private static final int ENABLE_SHUTTER_SOUND = 501; private static final int SET_DISPLAY_ORIENTATION = 502; + // Histogram + private static final int SET_HISTOGRAM_MODE = 601; + private static final int SEND_HISTOGRAM_DATA = 602; private CameraHandler mCameraHandler; private android.hardware.Camera mCamera; @@ -317,6 +322,13 @@ class AndroidCameraManagerImpl implements CameraManager { mParametersIsDirty = true; return; + case SET_HISTOGRAM_MODE: + mCamera.setHistogramMode((CameraDataCallback) msg.obj); + break; + + case SEND_HISTOGRAM_DATA: + mCamera.sendHistogramData(); + break; default: throw new RuntimeException("Invalid CameraProxy message=" + msg.what); } @@ -540,6 +552,14 @@ class AndroidCameraManagerImpl implements CameraManager { mCameraHandler.obtainMessage( ENABLE_SHUTTER_SOUND, (enable ? 1 : 0), 0).sendToTarget(); } + @Override + public void setHistogramMode(CameraDataCallback cb) { + mCameraHandler.obtainMessage(SET_HISTOGRAM_MODE, cb).sendToTarget(); + } + @Override + public void sendHistogramData() { + mCameraHandler.sendEmptyMessage(SEND_HISTOGRAM_DATA); + } } /** |