Merge "camera2-portability: Switch to ratio-based zoom interfaces" into lmp-dev

1 files changed, 14 insertions, 13 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
index cae022d..d0600e8 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
@@ -47,7 +47,6 @@ public abstract class CameraSettings {
     protected byte mJpegCompressQuality;
     protected int mCurrentPhotoFormat;
     protected float mCurrentZoomRatio;
-    protected int mCurrentZoomIndex;
     protected int mExposureCompensationIndex;
     protected CameraCapabilities.FlashMode mCurrentFlashMode;
     protected CameraCapabilities.FocusMode mCurrentFocusMode;
@@ -128,7 +127,6 @@ public abstract class CameraSettings {
         mJpegCompressQuality = src.mJpegCompressQuality;
         mCurrentPhotoFormat = src.mCurrentPhotoFormat;
         mCurrentZoomRatio = src.mCurrentZoomRatio;
-        mCurrentZoomIndex = src.mCurrentZoomIndex;
         mExposureCompensationIndex = src.mExposureCompensationIndex;
         mCurrentFlashMode = src.mCurrentFlashMode;
         mCurrentFocusMode = src.mCurrentFocusMode;
@@ -312,16 +310,6 @@ public abstract class CameraSettings {
         mCurrentZoomRatio = ratio;
     }
 
-    @Deprecated
-    public int getCurrentZoomIndex() {
-        return mCurrentZoomIndex;
-    }
-
-    @Deprecated
-    public void setZoomIndex(int index) {
-        mCurrentZoomIndex = index;
-    }
-
     /** Exposure **/
 
     public void setExposureCompensationIndex(int index) {
@@ -343,6 +331,14 @@ public abstract class CameraSettings {
         return mAutoExposureLocked;
     }
 
+    /**
+     * @param areas The areas for autoexposure. The coordinate system has domain
+     *              and range [-1000,1000], measured relative to the visible
+     *              preview image, with orientation matching that of the sensor.
+     *              This means the coordinates must be transformed to account
+     *              for the devices rotation---but not the zoom level---before
+     *              being passed into this method.
+     */
     public void setMeteringAreas(List<Camera.Area> areas) {
         mMeteringAreas.clear();
         if (areas != null) {
@@ -382,7 +378,12 @@ public abstract class CameraSettings {
     }
 
     /**
-     * @param areas The areas to focus.
+     * @param areas The areas to focus. The coordinate system has domain and
+     *              range [-1000,1000], measured relative to the visible preview
+     *              image, with orientation matching that of the sensor. This
+     *              means the coordinates must be transformed to account for
+     *              the devices rotation---but not the zoom level---before being
+     *              passed into this method.
      */
     public void setFocusAreas(List<Camera.Area> areas) {
         mFocusAreas.clear();