summaryrefslogtreecommitdiffstats
path: root/camera2/utils/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'camera2/utils/src/com/android')
-rw-r--r--camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerForwarder.java (renamed from camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java)10
-rw-r--r--camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerSplitter.java (renamed from camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java)24
2 files changed, 17 insertions, 17 deletions
diff --git a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerForwarder.java
index 97b5b6e..35b1c6d 100644
--- a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java
+++ b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerForwarder.java
@@ -17,7 +17,7 @@
package com.android.ex.camera2.utils;
import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
+import android.hardware.camera2.CameraCaptureSession.CaptureListener;
import android.hardware.camera2.CaptureFailure;
import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.CaptureResult;
@@ -25,14 +25,14 @@ import android.hardware.camera2.TotalCaptureResult;
import android.os.Handler;
/**
- * Proxy that forwards all updates to another {@link CaptureCallback}, invoking
+ * Proxy that forwards all updates to another {@link CaptureListener}, invoking
* its callbacks on a separate {@link Handler}.
*/
-public class Camera2CaptureCallbackForwarder extends CaptureCallback {
- private CaptureCallback mListener;
+public class Camera2CaptureListenerForwarder extends CaptureListener {
+ private CaptureListener mListener;
private Handler mHandler;
- public Camera2CaptureCallbackForwarder(CaptureCallback listener, Handler handler) {
+ public Camera2CaptureListenerForwarder(CaptureListener listener, Handler handler) {
mListener = listener;
mHandler = handler;
}
diff --git a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerSplitter.java
index f813076..a13dc04 100644
--- a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java
+++ b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerSplitter.java
@@ -17,7 +17,7 @@
package com.android.ex.camera2.utils;
import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
+import android.hardware.camera2.CameraCaptureSession.CaptureListener;
import android.hardware.camera2.CaptureFailure;
import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.CaptureResult;
@@ -28,18 +28,18 @@ import java.util.LinkedList;
import java.util.List;
/**
- * Junction that allows notifying multiple {@link CaptureCallback}s whenever
+ * Junction that allows notifying multiple {@link CaptureListener}s whenever
* the {@link CameraCaptureSession} posts a capture-related update.
*/
-public class Camera2CaptureCallbackSplitter extends CaptureCallback {
- private final List<CaptureCallback> mRecipients = new LinkedList<>();
+public class Camera2CaptureListenerSplitter extends CaptureListener {
+ private final List<CaptureListener> mRecipients = new LinkedList<>();
/**
* @param recipients The listeners to notify. Any {@code null} passed here
* will be completely ignored.
*/
- public Camera2CaptureCallbackSplitter(CaptureCallback... recipients) {
- for (CaptureCallback listener : recipients) {
+ public Camera2CaptureListenerSplitter(CaptureListener... recipients) {
+ for (CaptureListener listener : recipients) {
if (listener != null) {
mRecipients.add(listener);
}
@@ -49,7 +49,7 @@ public class Camera2CaptureCallbackSplitter extends CaptureCallback {
@Override
public void onCaptureCompleted(CameraCaptureSession session, CaptureRequest request,
TotalCaptureResult result) {
- for (CaptureCallback target : mRecipients) {
+ for (CaptureListener target : mRecipients) {
target.onCaptureCompleted(session, request, result);
}
}
@@ -57,7 +57,7 @@ public class Camera2CaptureCallbackSplitter extends CaptureCallback {
@Override
public void onCaptureFailed(CameraCaptureSession session, CaptureRequest request,
CaptureFailure failure) {
- for (CaptureCallback target : mRecipients) {
+ for (CaptureListener target : mRecipients) {
target.onCaptureFailed(session, request, failure);
}
}
@@ -65,14 +65,14 @@ public class Camera2CaptureCallbackSplitter extends CaptureCallback {
@Override
public void onCaptureProgressed(CameraCaptureSession session, CaptureRequest request,
CaptureResult partialResult) {
- for (CaptureCallback target : mRecipients) {
+ for (CaptureListener target : mRecipients) {
target.onCaptureProgressed(session, request, partialResult);
}
}
@Override
public void onCaptureSequenceAborted(CameraCaptureSession session, int sequenceId) {
- for (CaptureCallback target : mRecipients) {
+ for (CaptureListener target : mRecipients) {
target.onCaptureSequenceAborted(session, sequenceId);
}
}
@@ -80,7 +80,7 @@ public class Camera2CaptureCallbackSplitter extends CaptureCallback {
@Override
public void onCaptureSequenceCompleted(CameraCaptureSession session, int sequenceId,
long frameNumber) {
- for (CaptureCallback target : mRecipients) {
+ for (CaptureListener target : mRecipients) {
target.onCaptureSequenceCompleted(session, sequenceId, frameNumber);
}
}
@@ -88,7 +88,7 @@ public class Camera2CaptureCallbackSplitter extends CaptureCallback {
@Override
public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
long timestamp) {
- for (CaptureCallback target : mRecipients) {
+ for (CaptureListener target : mRecipients) {
target.onCaptureStarted(session, request, timestamp);
}
}