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

am a910390b: Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev

Browse Source 
* commit 'a910390b7d64fba46e7c2034f7085b04e5268cab':
  Camera: Add SCENE_MODE_HDR.
This commit is contained in:
Eino-Ville Talvala
2012-09-11 11:21:47 -07:00
committed by Android Git Automerger
parent 3827922569 a910390b7d
commit 94aa95beca
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1806,6 +1806,15 @@ public class Camera {
*/ */
public static final String SCENE_MODE_BARCODE = "barcode"; public static final String SCENE_MODE_BARCODE = "barcode";
/**
* Capture a scene using high dynamic range imaging techniques. The
* camera will return an image that has an extended dynamic range
* compared to a regular capture. Capturing such an image may take
* longer than a regular capture.
* @hide
*/
public static final String SCENE_MODE_HDR = "hdr";
/** /**
* Auto-focus mode. Applications should call {@link * Auto-focus mode. Applications should call {@link
* #autoFocus(AutoFocusCallback)} to start the focus in this mode. * #autoFocus(AutoFocusCallback)} to start the focus in this mode.
@@ -2809,6 +2818,7 @@ public class Camera {
* @see #SCENE_MODE_SPORTS * @see #SCENE_MODE_SPORTS
* @see #SCENE_MODE_PARTY * @see #SCENE_MODE_PARTY
* @see #SCENE_MODE_CANDLELIGHT * @see #SCENE_MODE_CANDLELIGHT
* @see #SCENE_MODE_BARCODE
*/ */
public String getSceneMode() { public String getSceneMode() {
return get(KEY_SCENE_MODE); return get(KEY_SCENE_MODE);