drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 27292 into eclair

Browse Source 
* changes:
  Add documentation about flash and change video-light to torch.
This commit is contained in:
Android (Google) Code Review
2009-09-27 22:13:43 -04:00
parent 960972d465 068ef42c3f
commit e883847f17
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.xml
View File

@ -68541,11 +68541,11 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="FLASH_MODE_VIDEO_LIGHT" <field name="FLASH_MODE_TORCH"
type="java.lang.String" type="java.lang.String"
transient="false" transient="false"
volatile="false" volatile="false"
value="&quot;video-light&quot;" value="&quot;torch&quot;"
static="true" static="true"
final="true" final="true"
deprecated="not deprecated" deprecated="not deprecated"

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

@ -368,6 +368,9 @@ public class Camera {
* uses auto-focus with the * uses auto-focus with the
* <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">&lt;uses-feature></a> * <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">&lt;uses-feature></a>
* manifest element.</p> * manifest element.</p>
* <p>If the current flash mode is not
* {@link android.hardware.Camera.Parameters#FLASH_MODE_OFF}, flash may be
* fired during auto-focus depending on the driver.<p>
* *
* @param cb the callback to run * @param cb the callback to run
*/ */
@ -637,12 +640,13 @@ public class Camera {
*/ */
public static final String FLASH_MODE_OFF = "off"; public static final String FLASH_MODE_OFF = "off";
/** /**
* Flash will be fired automatically when required. The timing is * Flash will be fired automatically when required. The flash may be fired
* decided by camera driver. * during preview, auto-focus, or snapshot depending on the driver.
*/ */
public static final String FLASH_MODE_AUTO = "auto"; public static final String FLASH_MODE_AUTO = "auto";
/** /**
* Flash will always be fired. The timing is decided by camera driver. * Flash will always be fired during snapshot. The flash may also be
* fired during preview or auto-focus depending on the driver.
*/ */
public static final String FLASH_MODE_ON = "on"; public static final String FLASH_MODE_ON = "on";
/** /**
@ -650,9 +654,10 @@ public class Camera {
*/ */
public static final String FLASH_MODE_RED_EYE = "red-eye"; public static final String FLASH_MODE_RED_EYE = "red-eye";
/** /**
* Constant emission of light. This can be used for video recording. * Constant emission of light during preview, auto-focus and snapshot.
* This can also be used for video recording.
*/ */
public static final String FLASH_MODE_VIDEO_LIGHT = "video-light"; public static final String FLASH_MODE_TORCH = "torch";
// Values for scene mode settings. // Values for scene mode settings.
public static final String SCENE_MODE_AUTO = "auto"; public static final String SCENE_MODE_AUTO = "auto";