diff options
author | Sol Boucher <solb@google.com> | 2014-08-28 03:37:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-28 03:37:32 +0000 |
commit | 25c45cca5f0ee247554d26a3376096ed5c8ec010 (patch) | |
tree | 47019f381aa3f7bfb20b272d6de0f893c9845813 | |
parent | d500784b9bdca48d19604bb4cebe84ea08c88a90 (diff) | |
parent | 415cf3ee18640ad0799e5c9a738afd1d19c14883 (diff) | |
download | android_frameworks_ex-25c45cca5f0ee247554d26a3376096ed5c8ec010.tar.gz android_frameworks_ex-25c45cca5f0ee247554d26a3376096ed5c8ec010.tar.bz2 android_frameworks_ex-25c45cca5f0ee247554d26a3376096ed5c8ec010.zip |
am 415cf3ee: camera2-portability: Allow disabling the shutter sound on API 2
* commit '415cf3ee18640ad0799e5c9a738afd1d19c14883':
camera2-portability: Allow disabling the shutter sound on API 2
-rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java | 15 |
1 files changed, 11 insertions, 4 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 bce1b98..847ca22 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java @@ -936,6 +936,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { private final CameraDeviceInfo.Characteristics mCharacteristics; private final AndroidCamera2Capabilities mCapabilities; private CameraSettings mLastSettings; + private boolean mShutterSoundEnabled; public AndroidCamera2ProxyImpl(int cameraIndex, CameraDevice camera, CameraDeviceInfo.Characteristics characteristics, @@ -945,6 +946,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { mCharacteristics = characteristics; mCapabilities = new AndroidCamera2Capabilities(properties); mLastSettings = null; + mShutterSoundEnabled = true; } // TODO: Implement @@ -1053,7 +1055,9 @@ class AndroidCamera2AgentImpl extends CameraAgent { handler.post(new Runnable() { @Override public void run() { - mNoisemaker.play(MediaActionSound.SHUTTER_CLICK); + if (mShutterSoundEnabled) { + mNoisemaker.play(MediaActionSound.SHUTTER_CLICK); + } shutter.onShutter(AndroidCamera2ProxyImpl.this); }}); } @@ -1141,6 +1145,11 @@ class AndroidCamera2AgentImpl extends CameraAgent { return false; } + @Override + public void enableShutterSound(boolean enable) { + mShutterSoundEnabled = enable; + } + // TODO: Implement @Override public String dumpDeviceSettings() { return null; } @@ -1301,9 +1310,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { @Override public boolean canDisableShutterSound() { - // The new API doesn't support this operation, so don't encourage people to try it. - // TODO: What kind of assumptions have callers made about this result's meaning? - return false; + return true; } private static float[] convertRectToPoly(RectF rf) { |