diff options
-rw-r--r-- | apps/TestingCamera2/Android.mk | 2 | ||||
-rw-r--r-- | apps/TestingCamera2/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/apps/TestingCamera2/Android.mk b/apps/TestingCamera2/Android.mk index 2a03f8d..868de25 100644 --- a/apps/TestingCamera2/Android.mk +++ b/apps/TestingCamera2/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -#LOCAL_SDK_VERSION := current +LOCAL_SDK_VERSION := current LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2 diff --git a/apps/TestingCamera2/AndroidManifest.xml b/apps/TestingCamera2/AndroidManifest.xml index 6682879..5127f0e 100644 --- a/apps/TestingCamera2/AndroidManifest.xml +++ b/apps/TestingCamera2/AndroidManifest.xml @@ -29,8 +29,8 @@ android:required="false" /> <uses-sdk - android:minSdkVersion="L" - android:targetSdkVersion="L" /> + android:minSdkVersion="21" + android:targetSdkVersion="21" /> <uses-feature android:name="android.hardware.camera.front" diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java b/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java index c8f54d1..00f721e 100644 --- a/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java +++ b/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java @@ -78,7 +78,7 @@ public class CameraControlPane extends ControlPane { /** * These correspond to the callbacks from - * android.hardware.camera2.CameraDevice.StateListener, plus UNAVAILABLE for + * android.hardware.camera2.CameraDevice.StateCallback, plus UNAVAILABLE for * when there's not a valid camera selected. */ private enum CameraState { @@ -90,7 +90,7 @@ public class CameraControlPane extends ControlPane { } /** - * These correspond to the callbacks from {@link CameraCaptureSession.StateListener}, plus + * These correspond to the callbacks from {@link CameraCaptureSession.StateCallback}, plus * {@code CONFIGURING} for before a session is returned and {@code NONE} for when there * is no session created. */ @@ -356,7 +356,7 @@ public class CameraControlPane extends ControlPane { private void updateCameraList() { mCameraIds = null; try { - mCameraIds = mCameraOps.getCamerasAndListen(mCameraAvailabilityListener); + mCameraIds = mCameraOps.getCamerasAndListen(mCameraAvailabilityCallback); String[] cameraSpinnerItems = new String[mCameraIds.length]; for (int i = 0; i < mCameraIds.length; i++) { cameraSpinnerItems[i] = String.format("Camera %s", mCameraIds[i]); @@ -455,8 +455,8 @@ public class CameraControlPane extends ControlPane { } }; - private final CameraCaptureSession.StateListener mSessionListener = - new CameraCaptureSession.StateListener() { + private final CameraCaptureSession.StateCallback mSessionListener = + new CameraCaptureSession.StateCallback() { @Override public void onConfigured(CameraCaptureSession session) { @@ -516,7 +516,7 @@ public class CameraControlPane extends ControlPane { } }; - private final CameraDevice.StateListener mCameraListener = new CameraDevice.StateListener() { + private final CameraDevice.StateCallback mCameraListener = new CameraDevice.StateCallback() { @Override public void onClosed(CameraDevice camera) { // Don't change state on close, tracked by callers of close() @@ -648,8 +648,8 @@ public class CameraControlPane extends ControlPane { } } - private final CameraManager.AvailabilityListener mCameraAvailabilityListener = - new CameraManager.AvailabilityListener() { + private final CameraManager.AvailabilityCallback mCameraAvailabilityCallback = + new CameraManager.AvailabilityCallback() { @Override public void onCameraAvailable(String cameraId) { // TODO: Update camera list in an intelligent fashion |