camera2-portability: Add focus locks and touch-to-focus for API 2

This implements focus locks very simply using only camera2 API requests: the
lens is locked on autoFocus() and unlocked on cancelAutoFocus(), as with the
existing legacy API--backed implementation. Both passive and active focus modes
ares supported, with and without positional focusing.

Change-Id: I26b1866539807fd3d64189923871443056a166af

1 files changed, 10 insertions, 1 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
index 03c9ba6..b81e098 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
@@ -82,7 +82,6 @@ public class AndroidCamera2Capabilities extends CameraCapabilities {
         mExposureCompensationStep = (float) ecStep.getNumerator() / ecStep.getDenominator();
 
         mMaxNumOfFacesSupported = p.get(STATISTICS_INFO_MAX_FACE_COUNT);
-        mMaxNumOfFocusAreas = p.get(CONTROL_MAX_REGIONS_AF);
         mMaxNumOfMeteringArea = p.get(CONTROL_MAX_REGIONS_AE);
 
         // TODO: Populate mMaxZoomRatio
@@ -90,6 +89,16 @@ public class AndroidCamera2Capabilities extends CameraCapabilities {
         // TODO: Populate mVerticalViewAngle
         // TODO: Populate mZoomRatioList
         // TODO: Populate mMaxZoomIndex
+
+        if (supports(FocusMode.AUTO)) {
+            mMaxNumOfFocusAreas = p.get(CONTROL_MAX_REGIONS_AF);
+            if (mMaxNumOfFocusAreas > 0) {
+                mSupportedFeatures.add(Feature.FOCUS_AREA);
+            }
+        }
+        if (mMaxNumOfMeteringArea > 0) {
+            mSupportedFeatures.add(Feature.METERING_AREA);
+        }
     }
 
     public IntegralStringifier getIntegralStringifier() {