Merge "Unhide camera autofocus move callback." (5573ac01) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -9453,6 +9453,7 @@ package android.hardware {
		method public static android.hardware.Camera open();
		method public final void reconnect() throws java.io.IOException;
		method public final void release();
		method public void setAutoFocusMoveCallback(android.hardware.Camera.AutoFocusMoveCallback);
		method public final void setDisplayOrientation(int);
		method public final void setErrorCallback(android.hardware.Camera.ErrorCallback);
		method public final void setFaceDetectionListener(android.hardware.Camera.FaceDetectionListener);
		@@ -9488,6 +9489,10 @@ package android.hardware {
		method public abstract void onAutoFocus(boolean, android.hardware.Camera);
		}

		public static abstract interface Camera.AutoFocusMoveCallback {
		method public abstract void onAutoFocusMoving(boolean, android.hardware.Camera);
		}

		public static class Camera.CameraInfo {
		ctor public Camera.CameraInfo();
		field public static final int CAMERA_FACING_BACK = 0; // 0x0

+5 −7

Original line number	Diff line number	Diff line
		@@ -950,11 +950,10 @@ public class Camera {
		/**
		* Callback interface used to notify on auto focus start and stop.
		*
		* <p>This is useful for continuous autofocus -- {@link Parameters#FOCUS_MODE_CONTINUOUS_VIDEO}
		* and {@link Parameters#FOCUS_MODE_CONTINUOUS_PICTURE}. Applications can
		* show autofocus animation.</p>
		*
		* @hide
		* <p>This is only supported in continuous autofocus modes -- {@link
		* Parameters#FOCUS_MODE_CONTINUOUS_VIDEO} and {@link
		* Parameters#FOCUS_MODE_CONTINUOUS_PICTURE}. Applications can show
		* autofocus animation based on this.</p>
		*/
		public interface AutoFocusMoveCallback
		{
		@@ -971,7 +970,6 @@ public class Camera {
		* Sets camera auto-focus move callback.
		*
		* @param cb the callback to run
		* @hide
		*/
		public void setAutoFocusMoveCallback(AutoFocusMoveCallback cb) {
		mAutoFocusMoveCallback = cb;