Remove android.hardware.camera2 import from Settings3A.

Bug: 17358060
Change-Id: I7e4442a4257acf9e4b58981be697949aba62a31f

4 files changed, 18 insertions, 22 deletions

diff --git a/src/com/android/camera/one/Settings3A.java b/src/com/android/camera/one/Settings3A.java
index 53f9d5860..24edd28f9 100644
--- a/src/com/android/camera/one/Settings3A.java
+++ b/src/com/android/camera/one/Settings3A.java
@@ -16,8 +16,6 @@
 
 package com.android.camera.one;
 
-import android.hardware.camera2.params.MeteringRectangle;
-
 /**
  * Contains 3A parameters common to all camera flavors.
  * TODO: Move to GservicesHelper.
@@ -40,16 +38,6 @@ public class Settings3A {
     /** Metering region weight between 0 and 1. */
     private static final float REGION_WEIGHT = 0.25f;
 
-    /** camera2 API metering region weight. */
-    private static final int CAMERA2_REGION_WEIGHT = (int)
-            (((1 - REGION_WEIGHT) * MeteringRectangle.METERING_WEIGHT_MIN +
-                    REGION_WEIGHT * MeteringRectangle.METERING_WEIGHT_MAX));
-
-    /** Zero weight 3A region, to reset regions per API. */
-    private static final MeteringRectangle[] ZERO_WEIGHT_3A_REGION = new MeteringRectangle[]{
-            new MeteringRectangle(0, 0, 0, 0, 0)
-    };
-
     /** Duration to hold after manual tap to focus. */
     private static final int FOCUS_HOLD_MILLIS = 3000;
 
@@ -62,12 +50,8 @@ public class Settings3A {
         return AE_REGION_BOX;
     }
 
-    public static int getCamera2MeteringWeight() {
-        return CAMERA2_REGION_WEIGHT;
-    }
-
-    public static MeteringRectangle[] getZeroWeightRegion() {
-        return ZERO_WEIGHT_3A_REGION;
+    public static float getMeteringRegionWeight() {
+        return REGION_WEIGHT;
     }
 
     public static int getFocusHoldMillis() {
diff --git a/src/com/android/camera/one/v2/AutoFocusHelper.java b/src/com/android/camera/one/v2/AutoFocusHelper.java
index 46e4df369..f0e7f8574 100644
--- a/src/com/android/camera/one/v2/AutoFocusHelper.java
+++ b/src/com/android/camera/one/v2/AutoFocusHelper.java
@@ -32,7 +32,19 @@ import com.android.camera.one.Settings3A;
 public class AutoFocusHelper {
     private static final Log.Tag TAG = new Log.Tag("OneCameraAFHelp");
 
-    private static final int METERING_WEIGHT = Settings3A.getCamera2MeteringWeight();
+    /** camera2 API metering region weight. */
+    private static final int CAMERA2_REGION_WEIGHT = (int)
+            (((1 - Settings3A.getMeteringRegionWeight()) * MeteringRectangle.METERING_WEIGHT_MIN +
+                    Settings3A.getMeteringRegionWeight() * MeteringRectangle.METERING_WEIGHT_MAX));
+
+    /** Zero weight 3A region, to reset regions per API. */
+    private static final MeteringRectangle[] ZERO_WEIGHT_3A_REGION = new MeteringRectangle[]{
+            new MeteringRectangle(0, 0, 0, 0, 0)
+    };
+
+    public static MeteringRectangle[] getZeroWeightRegion() {
+        return ZERO_WEIGHT_3A_REGION;
+    }
 
     /**
      * Convert reported camera2 AF state to OneCamera AutoFocusState.
@@ -108,7 +120,7 @@ public class AutoFocusHelper {
         if (!region.intersect(cropRegion)) {
             region = cropRegion;
         }
-        return new MeteringRectangle[]{new MeteringRectangle(region, METERING_WEIGHT)};
+        return new MeteringRectangle[]{new MeteringRectangle(region, CAMERA2_REGION_WEIGHT)};
     }
 
     /**
diff --git a/src/com/android/camera/one/v2/OneCameraImpl.java b/src/com/android/camera/one/v2/OneCameraImpl.java
index 50af15c51..1abdadbc3 100644
--- a/src/com/android/camera/one/v2/OneCameraImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraImpl.java
@@ -99,7 +99,7 @@ public class OneCameraImpl extends AbstractOneCamera {
     /** Duration to hold after manual focus tap. */
     private static final int FOCUS_HOLD_MILLIS = Settings3A.getFocusHoldMillis();
     /** Zero weight 3A region, to reset regions per API. */
-    MeteringRectangle[] ZERO_WEIGHT_3A_REGION = Settings3A.getZeroWeightRegion();
+    MeteringRectangle[] ZERO_WEIGHT_3A_REGION = AutoFocusHelper.getZeroWeightRegion();
 
     /**
      * CaptureRequest tags.
diff --git a/src/com/android/camera/one/v2/OneCameraZslImpl.java b/src/com/android/camera/one/v2/OneCameraZslImpl.java
index d078f106f..7a4da7461 100644
--- a/src/com/android/camera/one/v2/OneCameraZslImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraZslImpl.java
@@ -120,7 +120,7 @@ public class OneCameraZslImpl extends AbstractOneCamera {
      */
     private static final String FOCUS_RESUME_CALLBACK_TOKEN = "RESUME_CONTINUOUS_AF";
     /** Zero weight 3A region, to reset regions per API. */
-    MeteringRectangle[] ZERO_WEIGHT_3A_REGION = Settings3A.getZeroWeightRegion();
+    MeteringRectangle[] ZERO_WEIGHT_3A_REGION = AutoFocusHelper.getZeroWeightRegion();
 
     /**
      * Thread on which high-priority camera operations, such as grabbing preview