diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-11 11:20:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-11 11:20:09 -0700 |
| commit | a910390b7d64fba46e7c2034f7085b04e5268cab (patch) | |
| tree | 7606e2bc41308cc8e31526013bedcfdf237005bf /core/java/android/hardware/Camera.java | |
| parent | 5cf8bd79bbdef0185574f0e3514124583ad537cd (diff) | |
| parent | da2f0ea10822628875a956e4bf096066c0debe9f (diff) | |
| download | frameworks_base-a910390b7d64fba46e7c2034f7085b04e5268cab.zip frameworks_base-a910390b7d64fba46e7c2034f7085b04e5268cab.tar.gz frameworks_base-a910390b7d64fba46e7c2034f7085b04e5268cab.tar.bz2 | |
Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev
Diffstat (limited to 'core/java/android/hardware/Camera.java')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 652356c..7a941b8 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1807,6 +1807,15 @@ public class Camera { 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 * #autoFocus(AutoFocusCallback)} to start the focus in this mode. */ @@ -2809,6 +2818,7 @@ public class Camera { * @see #SCENE_MODE_SPORTS * @see #SCENE_MODE_PARTY * @see #SCENE_MODE_CANDLELIGHT + * @see #SCENE_MODE_BARCODE */ public String getSceneMode() { return get(KEY_SCENE_MODE); |