camera: add power mode support (3a287a25) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −0

core/java/android/hardware/Camera.java

+38 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1806,6 +1806,7 @@ public class Camera {
	private static final String KEY_RECORDING_HINT = "recording-hint";		private static final String KEY_RECORDING_HINT = "recording-hint";
	private static final String KEY_VIDEO_SNAPSHOT_SUPPORTED = "video-snapshot-supported";		private static final String KEY_VIDEO_SNAPSHOT_SUPPORTED = "video-snapshot-supported";
	private static final String KEY_FULL_VIDEO_SNAP_SUPPORTED = "full-video-snap-supported";		private static final String KEY_FULL_VIDEO_SNAP_SUPPORTED = "full-video-snap-supported";
			private static final String KEY_POWER_MODE_SUPPORTED = "power-mode-supported";
	private static final String KEY_VIDEO_STABILIZATION = "video-stabilization";		private static final String KEY_VIDEO_STABILIZATION = "video-stabilization";
	private static final String KEY_VIDEO_STABILIZATION_SUPPORTED = "video-stabilization-supported";		private static final String KEY_VIDEO_STABILIZATION_SUPPORTED = "video-stabilization-supported";
	private static final String KEY_SHARPNESS = "sharpness";		private static final String KEY_SHARPNESS = "sharpness";
	@@ -1824,6 +1825,8 @@ public class Camera {
	private static final String KEY_CAMERA_MODE = "camera-mode";		private static final String KEY_CAMERA_MODE = "camera-mode";
	private static final String KEY_VIDEO_HIGH_FRAME_RATE = "video-hfr";		private static final String KEY_VIDEO_HIGH_FRAME_RATE = "video-hfr";

			private static final String KEY_POWER_MODE = "power-mode";

	// Parameter key suffix for supported values.		// Parameter key suffix for supported values.
	private static final String SUPPORTED_VALUES_SUFFIX = "-values";		private static final String SUPPORTED_VALUES_SUFFIX = "-values";

	@@ -1923,6 +1926,10 @@ public class Camera {
	/** @hide */		/** @hide */
	public static final String AE_BRACKET = "AE-Bracket";		public static final String AE_BRACKET = "AE-Bracket";

			// Values for POWER MODE
			public static final String LOW_POWER = "Low_Power";
			public static final String NORMAL_POWER = "Normal_Power";

	// Values for HFR settings.		// Values for HFR settings.
	/** @hide */		/** @hide */
	public static final String VIDEO_HFR_OFF = "off";		public static final String VIDEO_HFR_OFF = "off";
	@@ -3457,6 +3464,28 @@ public class Camera {
	set(KEY_SCENE_MODE, value);		set(KEY_SCENE_MODE, value);
	}		}

			/**
			* Sets the Power mode.
			*
			* @param value Power mode.
			* @see #getPowerMode()
			*/
			public void setPowerMode(String value) {
			set(KEY_POWER_MODE, value);
			}

			/**
			* Gets the current power mode setting.
			*
			* @return current power mode. null if power mode setting is not
			* supported.
			* @see #POWER_MODE_LOW
			* @see #POWER_MODE_NORMAL
			*/
			public String getPowerMode() {
			return get(KEY_POWER_MODE);
			}

	/**		/**
	* Gets the supported scene modes.		* Gets the supported scene modes.
	*		*
	@@ -4493,6 +4522,14 @@ public class Camera {
	return TRUE.equals(str);		return TRUE.equals(str);
	}		}

			/**
			* @return true if full size video snapshot is supported.
			*/
			public boolean isPowerModeSupported() {
			String str = get(KEY_POWER_MODE_SUPPORTED);
			return TRUE.equals(str);
			}

	/**		/**
	* @hide		* @hide
	* Gets the current face detection setting.		* Gets the current face detection setting.

Original line number	Original line	Diff line number	Diff line
	@@ -9644,6 +9644,7 @@ package android.hardware {
	method public int getJpegQuality();		method public int getJpegQuality();
	method public int getJpegThumbnailQuality();		method public int getJpegThumbnailQuality();
	method public android.hardware.Camera.Size getJpegThumbnailSize();		method public android.hardware.Camera.Size getJpegThumbnailSize();
			method public java.lang.String getPowerMode();
	method public int getMaxExposureCompensation();		method public int getMaxExposureCompensation();
	method public int getMaxNumDetectedFaces();		method public int getMaxNumDetectedFaces();
	method public int getMaxNumFocusAreas();		method public int getMaxNumFocusAreas();
	@@ -9680,6 +9681,7 @@ package android.hardware {
	method public java.util.List<java.lang.Integer> getZoomRatios();		method public java.util.List<java.lang.Integer> getZoomRatios();
	method public boolean isAutoExposureLockSupported();		method public boolean isAutoExposureLockSupported();
	method public boolean isAutoWhiteBalanceLockSupported();		method public boolean isAutoWhiteBalanceLockSupported();
			method public boolean isPowerModeSupported();
	method public boolean isSmoothZoomSupported();		method public boolean isSmoothZoomSupported();
	method public boolean isVideoSnapshotSupported();		method public boolean isVideoSnapshotSupported();
	method public boolean isVideoStabilizationSupported();		method public boolean isVideoStabilizationSupported();
	@@ -9707,6 +9709,7 @@ package android.hardware {
	method public void setMeteringAreas(java.util.List<android.hardware.Camera.Area>);		method public void setMeteringAreas(java.util.List<android.hardware.Camera.Area>);
	method public void setPictureFormat(int);		method public void setPictureFormat(int);
	method public void setPictureSize(int, int);		method public void setPictureSize(int, int);
			method public void setPowerMode(java.lang.String);
	method public void setPreviewFormat(int);		method public void setPreviewFormat(int);
	method public void setPreviewFpsRange(int, int);		method public void setPreviewFpsRange(int, int);
	method public deprecated void setPreviewFrameRate(int);		method public deprecated void setPreviewFrameRate(int);
	@@ -9746,6 +9749,8 @@ package android.hardware {
	field public static final java.lang.String FOCUS_MODE_FIXED = "fixed";		field public static final java.lang.String FOCUS_MODE_FIXED = "fixed";
	field public static final java.lang.String FOCUS_MODE_INFINITY = "infinity";		field public static final java.lang.String FOCUS_MODE_INFINITY = "infinity";
	field public static final java.lang.String FOCUS_MODE_MACRO = "macro";		field public static final java.lang.String FOCUS_MODE_MACRO = "macro";
			field public static final java.lang.String LOW_POWER = "Low_Power";
			field public static final java.lang.String NORMAL_POWER = "Normal_Power";
	field public static final int PREVIEW_FPS_MAX_INDEX = 1; // 0x1		field public static final int PREVIEW_FPS_MAX_INDEX = 1; // 0x1
	field public static final int PREVIEW_FPS_MIN_INDEX = 0; // 0x0		field public static final int PREVIEW_FPS_MIN_INDEX = 0; // 0x0
	field public static final java.lang.String SCENE_MODE_ACTION = "action";		field public static final java.lang.String SCENE_MODE_ACTION = "action";