Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge into jb-mr1-dev

Browse Source 
Change-Id: I6bfc2726c0c259eeb3caf13e1cee395324cac4c3
This commit is contained in:
Jean-Baptiste Queru
2012-09-25 09:26:47 -07:00
parent 908a43234a 487acdfb4e
commit 93fd0f7a83
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/hardware/Camera.java
View File

@@ -1161,25 +1161,28 @@ public class Camera {
public native final void setDisplayOrientation(int degrees);
/**
* Enable or disable the default shutter sound when taking a picture.
* <p>Enable or disable the default shutter sound when taking a picture.</p>
*
* By default, the camera plays the system-defined camera shutter sound when
* {@link #takePicture} is called. Using this method, the shutter sound can
* be disabled. It is strongly recommended that an alternative shutter sound
* is played in the {@link ShutterCallback} when the system shutter sound is
* disabled.
* <p>By default, the camera plays the system-defined camera shutter sound
* when {@link #takePicture} is called. Using this method, the shutter sound
* can be disabled. It is strongly recommended that an alternative shutter
* sound is played in the {@link ShutterCallback} when the system shutter
* sound is disabled.</p>
*
* Note that devices may not always allow control of the camera shutter
* sound. If the shutter sound cannot be controlled, this method will return
* false.
* <p>Note that devices may not always allow disabling the camera shutter
* sound. If the shutter sound state cannot be set to the desired value,
* this method will return false. {@link CameraInfo#canDisableShutterSound}
* can be used to determine whether the device will allow the shutter sound
* to be disabled.</p>
*
* @param enabled whether the camera should play the system shutter sound
* when {@link #takePicture takePicture} is called.
* @return true if the shutter sound state was successfully changed. False
* if the shutter sound cannot be controlled; in this case, the
* application should not play its own shutter sound since the
* system shutter sound will play when a picture is taken.
* @return {@code true} if the shutter sound state was successfully
* changed. {@code false} if the shutter sound state could not be
* changed. {@code true} is also returned if shutter sound playback
* is already set to the requested state.
* @see #takePicture
* @see CameraInfo#canDisableShutterSound
* @see ShutterCallback
*/
public native final boolean enableShutterSound(boolean enabled);