camera2-portability: Switch to ratio-based zoom interfaces

This eliminates the deprecated index-based CameraSettings zoom methods in favor
of floating-point ratio based versions, and includes the plumbing to make those
work for both the camera1 and camera2 underlying framework APIs.

Bug: 17016658
Change-Id: I0567a53cd57bfa6d53604e3c5457a39ef49e3cb4

1 files changed, 3 insertions, 3 deletions

diff --git a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
index bb23e37..01eda8f 100644
--- a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
+++ b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
@@ -237,19 +237,19 @@ public class Camera2UtilsTest extends Camera2DeviceTester {
     @Test(expected=NullPointerException.class)
     public void requestSettingsSetNullArgToCreateRequest0() throws Exception {
         Camera2RequestSettingsSet setUp = new Camera2RequestSettingsSet();
-        setUp.createRequest(null, 0);
+        setUp.createRequest(null, CameraDevice.TEMPLATE_PREVIEW);
     }
 
     @Test(expected=NullPointerException.class)
     public void requestSettingsSetNullArgToCreateRequest2() throws Exception {
         Camera2RequestSettingsSet setUp = new Camera2RequestSettingsSet();
-        setUp.createRequest(mCamera, 0, (Surface) null);
+        setUp.createRequest(mCamera, CameraDevice.TEMPLATE_PREVIEW, (Surface) null);
     }
 
     @Test(expected=NullPointerException.class)
     public void requestSettingsSetNullArgToCreateRequest02() throws Exception {
         Camera2RequestSettingsSet setUp = new Camera2RequestSettingsSet();
-        setUp.createRequest(null, 0, (Surface) null);
+        setUp.createRequest(null, CameraDevice.TEMPLATE_PREVIEW, (Surface) null);
     }
 
     @Test