diff options
author | Sol Boucher <solb@google.com> | 2014-08-22 10:33:44 -0700 |
---|---|---|
committer | Sol Boucher <solb@google.com> | 2014-08-22 11:01:16 -0700 |
commit | aa907a3b6637b4f95dbf572d0cf790a70ba3aeb0 (patch) | |
tree | f3d837cab0feef22ed99fec588985b9fb24a7cbe /camera2/portability | |
parent | 489e29ecbfd2ffe10ebd199204f3ee242b1bd1f8 (diff) | |
download | android_frameworks_ex-aa907a3b6637b4f95dbf572d0cf790a70ba3aeb0.tar.gz android_frameworks_ex-aa907a3b6637b4f95dbf572d0cf790a70ba3aeb0.tar.bz2 android_frameworks_ex-aa907a3b6637b4f95dbf572d0cf790a70ba3aeb0.zip |
camera2-portability: Play shutter sound for camera2 captures
Bug: 17109582
Change-Id: I73321cdbb2972b2d1e9bc2de93192fbb506347e7
Diffstat (limited to 'camera2/portability')
-rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java index e675796..d139c62 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java @@ -35,6 +35,7 @@ import android.hardware.camera2.TotalCaptureResult; import android.hardware.camera2.params.MeteringRectangle; import android.media.Image; import android.media.ImageReader; +import android.media.MediaActionSound; import android.os.Build; import android.os.Handler; import android.os.HandlerThread; @@ -63,6 +64,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { private final CameraStateHolder mCameraState; private final DispatchThread mDispatchThread; private final CameraManager mCameraManager; + private final MediaActionSound mNoisemaker; /** * Number of camera devices. The length of {@code mCameraDevices} does not reveal this @@ -88,6 +90,8 @@ class AndroidCamera2AgentImpl extends CameraAgent { mDispatchThread = new DispatchThread(mCameraHandler, mCameraHandlerThread); mDispatchThread.start(); mCameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE); + mNoisemaker = new MediaActionSound(); + mNoisemaker.load(MediaActionSound.SHUTTER_CLICK); mNumCameraDevices = 0; mCameraDevices = new ArrayList<String>(); @@ -915,7 +919,6 @@ class AndroidCamera2AgentImpl extends CameraAgent { }}); } - // TODO: Implement @Override public void takePicture(final Handler handler, final CameraShutterCallback shutter, @@ -932,6 +935,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { handler.post(new Runnable() { @Override public void run() { + mNoisemaker.play(MediaActionSound.SHUTTER_CLICK); shutter.onShutter(AndroidCamera2ProxyImpl.this); }}); } |