diff options
Diffstat (limited to 'camera2/public/src/com/android')
-rw-r--r-- | camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java | 18 | ||||
-rw-r--r-- | camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureListener.java (renamed from camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java) | 10 | ||||
-rw-r--r-- | camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionListener.java (renamed from camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java) | 14 | ||||
-rw-r--r-- | camera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java (renamed from camera2/public/src/com/android/ex/camera2/blocking/BlockingStateCallback.java) | 12 | ||||
-rw-r--r-- | camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java | 2 |
5 files changed, 28 insertions, 28 deletions
diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java index 407a08a..02dbbba 100644 --- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java +++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java @@ -66,7 +66,7 @@ public class BlockingCameraManager { /** * Returns the error code {@link ERROR_DISCONNECTED} if disconnected, or one of - * {@code CameraDevice.StateCallback#ERROR_*} if there was another error. + * {@code CameraDevice.StateListener#ERROR_*} if there was another error. * * @return int Disconnect/error code */ @@ -81,7 +81,7 @@ public class BlockingCameraManager { * @param errorCode * @param message * - * @see {@link CameraDevice.StateCallback#ERROR_CAMERA_DEVICE} + * @see {@link CameraDevice.StateListener#ERROR_CAMERA_DEVICE} */ public BlockingOpenException(int errorCode, String message) { super(message); @@ -117,8 +117,8 @@ public class BlockingCameraManager { * does.</p> * * <p>Throws {@link BlockingOpenException} when the open fails asynchronously (due to - * {@link CameraDevice.StateCallback#onDisconnected(CameraDevice)} or - * ({@link CameraDevice.StateCallback#onError(CameraDevice)}.</p> + * {@link CameraDevice.StateListener#onDisconnected(CameraDevice)} or + * ({@link CameraDevice.StateListener#onError(CameraDevice)}.</p> * * <p>Throws {@link TimeoutRuntimeException} if opening times out. This is usually * highly unrecoverable, and all future calls to opening that camera will fail since the @@ -142,7 +142,7 @@ public class BlockingCameraManager { * @throws TimeoutRuntimeException * If opening times out. Typically unrecoverable. */ - public CameraDevice openCamera(String cameraId, CameraDevice.StateCallback listener, + public CameraDevice openCamera(String cameraId, CameraDevice.StateListener listener, Handler handler) throws CameraAccessException, BlockingOpenException { if (handler == null) { @@ -163,17 +163,17 @@ public class BlockingCameraManager { /** * Block until CameraManager#openCamera finishes with onOpened/onError/onDisconnected * - * <p>Pass-through all StateCallback changes to the proxy.</p> + * <p>Pass-through all StateListener changes to the proxy.</p> * * <p>Time out after {@link #OPEN_TIME_OUT} and unblock. Clean up camera if it arrives * later.</p> */ - private class OpenListener extends CameraDevice.StateCallback { + private class OpenListener extends CameraDevice.StateListener { private static final int ERROR_UNINITIALIZED = -1; private final String mCameraId; - private final CameraDevice.StateCallback mProxy; + private final CameraDevice.StateListener mProxy; private final Object mLock = new Object(); private final ConditionVariable mDeviceReady = new ConditionVariable(); @@ -187,7 +187,7 @@ public class BlockingCameraManager { private boolean mTimedOut = false; OpenListener(CameraManager manager, String cameraId, - CameraDevice.StateCallback listener, Handler handler) + CameraDevice.StateListener listener, Handler handler) throws CameraAccessException { mCameraId = cameraId; mProxy = listener; diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureListener.java index 4fb2c43..eae85d1 100644 --- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java +++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureListener.java @@ -36,7 +36,7 @@ import com.android.ex.camera2.utils.StateWaiter; * * @see #getStateWaiter */ -public class BlockingCaptureCallback extends CameraCaptureSession.CaptureCallback { +public class BlockingCaptureListener extends CameraCaptureSession.CaptureListener { /** * {@link #onCaptureStarted} has been called. @@ -80,10 +80,10 @@ public class BlockingCaptureCallback extends CameraCaptureSession.CaptureCallbac "CAPTURE_SEQUENCE_ABORTED" }; - private static final String TAG = "BlockingCaptureCallback"; + private static final String TAG = "BlockingCaptureListener"; private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE); - private final CameraCaptureSession.CaptureCallback mProxy; + private final CameraCaptureSession.CaptureListener mProxy; private final StateWaiter mStateWaiter = new StateWaiter(sStateNames); private final StateChangeListener mStateChangeListener = mStateWaiter.getListener(); @@ -92,7 +92,7 @@ public class BlockingCaptureCallback extends CameraCaptureSession.CaptureCallbac * Create a blocking capture listener without forwarding the capture listener invocations * to another capture listener. */ - public BlockingCaptureCallback() { + public BlockingCaptureListener() { mProxy = null; } @@ -104,7 +104,7 @@ public class BlockingCaptureCallback extends CameraCaptureSession.CaptureCallbac * * @throws NullPointerException if {@code listener} was {@code null} */ - public BlockingCaptureCallback(CameraCaptureSession.CaptureCallback listener) { + public BlockingCaptureListener(CameraCaptureSession.CaptureListener listener) { if (listener == null) { throw new NullPointerException("listener must not be null"); } diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionListener.java index e041d27..26bb652 100644 --- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java +++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionListener.java @@ -36,11 +36,11 @@ import java.util.concurrent.TimeoutException; * <p>Provides a waiter that can be used to block until the next unobserved state of the * requested type arrives.</p> * - * <p>Pass-through all StateCallback changes to the proxy.</p> + * <p>Pass-through all StateListener changes to the proxy.</p> * * @see #getStateWaiter */ -public class BlockingSessionCallback extends CameraCaptureSession.StateCallback { +public class BlockingSessionListener extends CameraCaptureSession.StateListener { /** * Session is configured, ready for captures */ @@ -71,10 +71,10 @@ public class BlockingSessionCallback extends CameraCaptureSession.StateCallback /* * Private fields */ - private static final String TAG = "BlockingSessionCallback"; + private static final String TAG = "BlockingSessionListener"; private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE); - private final CameraCaptureSession.StateCallback mProxy; + private final CameraCaptureSession.StateListener mProxy; private final SessionFuture mSessionFuture = new SessionFuture(); private final StateWaiter mStateWaiter = new StateWaiter(sStateNames); @@ -92,7 +92,7 @@ public class BlockingSessionCallback extends CameraCaptureSession.StateCallback * Create a blocking session listener without forwarding the session listener invocations * to another session listener. */ - public BlockingSessionCallback() { + public BlockingSessionListener() { mProxy = null; } @@ -104,7 +104,7 @@ public class BlockingSessionCallback extends CameraCaptureSession.StateCallback * * @throws NullPointerException if {@code listener} was {@code null} */ - public BlockingSessionCallback(CameraCaptureSession.StateCallback listener) { + public BlockingSessionListener(CameraCaptureSession.StateListener listener) { if (listener == null) { throw new NullPointerException("listener must not be null"); } @@ -142,7 +142,7 @@ public class BlockingSessionCallback extends CameraCaptureSession.StateCallback } /* - * CameraCaptureSession.StateCallback implementation + * CameraCaptureSession.StateListener implementation */ @Override diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingStateCallback.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java index 5f93fbc..02c2ba3 100644 --- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingStateCallback.java +++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java @@ -36,14 +36,14 @@ import java.util.concurrent.TimeUnit; * the last wait, or that will be received from the camera device in the * future.</p> * - * <p>Pass-through all StateCallback changes to the proxy.</p> + * <p>Pass-through all StateListener changes to the proxy.</p> * */ -public class BlockingStateCallback extends CameraDevice.StateCallback { - private static final String TAG = "BlockingStateCallback"; +public class BlockingStateListener extends CameraDevice.StateListener { + private static final String TAG = "BlockingStateListener"; private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE); - private final CameraDevice.StateCallback mProxy; + private final CameraDevice.StateListener mProxy; // Guards mWaiting private final Object mLock = new Object(); @@ -99,11 +99,11 @@ public class BlockingStateCallback extends CameraDevice.StateCallback { */ private static int NUM_STATES = 4; - public BlockingStateCallback() { + public BlockingStateListener() { mProxy = null; } - public BlockingStateCallback(CameraDevice.StateCallback listener) { + public BlockingStateListener(CameraDevice.StateListener listener) { mProxy = listener; } diff --git a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java index e8a3ab6..9fa2af2 100644 --- a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java +++ b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java @@ -91,7 +91,7 @@ public class AutoFocusStateMachine { /** * Invoke every time we get a new CaptureResult via - * {@link CameraDevice.CaptureCallback#onCaptureCompleted}. + * {@link CameraDevice.CaptureListener#onCaptureCompleted}. * * <p>This function is responsible for dispatching updates via the * {@link AutoFocusStateListener} so without calling this on a regular basis, no |