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

Author: Eino-Ville Talvala

core/java/android/hardware/Camera.java

@@ -1806,6 +1806,15 @@ public class Parameters {
          */
         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 List<String> getSupportedAntibanding() {
          * @see #SCENE_MODE_SPORTS
          * @see #SCENE_MODE_PARTY
          * @see #SCENE_MODE_CANDLELIGHT
+         * @see #SCENE_MODE_BARCODE
          */
         public String getSceneMode() {
             return get(KEY_SCENE_MODE);