diff options
| author | Sol Boucher <solb@google.com> | 2014-08-23 06:19:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-23 06:19:15 +0000 |
| commit | c192e279acae7ce5b75e26c443bd53c33e9c667c (patch) | |
| tree | 78b246728df89f94e32622a740c0ae4084593cf0 /camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java | |
| parent | bfed64d0dc0020ab53ec734ea2547ea71ce0178f (diff) | |
| parent | f27e71f979e803a3ac00f4057eb909886d957a3e (diff) | |
| download | android_frameworks_ex-c192e279acae7ce5b75e26c443bd53c33e9c667c.tar.gz android_frameworks_ex-c192e279acae7ce5b75e26c443bd53c33e9c667c.tar.bz2 android_frameworks_ex-c192e279acae7ce5b75e26c443bd53c33e9c667c.zip | |
am f27e71f9: Merge "camera2-portability: Switch to ratio-based zoom interfaces" into lmp-dev
* commit 'f27e71f979e803a3ac00f4057eb909886d957a3e':
camera2-portability: Switch to ratio-based zoom interfaces
Diffstat (limited to 'camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java')
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java | 6 |
1 files changed, 5 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 51c1422..bd610cc 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java @@ -81,7 +81,7 @@ public class AndroidCamera2Capabilities extends CameraCapabilities { mMaxNumOfFacesSupported = p.get(STATISTICS_INFO_MAX_FACE_COUNT); mMaxNumOfMeteringArea = p.get(CONTROL_MAX_REGIONS_AE); - // TODO: Populate mMaxZoomRatio + mMaxZoomRatio = p.get(SCALER_AVAILABLE_MAX_DIGITAL_ZOOM); // TODO: Populate mHorizontalViewAngle // TODO: Populate mVerticalViewAngle // TODO: Populate mZoomRatioList @@ -97,6 +97,10 @@ public class AndroidCamera2Capabilities extends CameraCapabilities { mSupportedFeatures.add(Feature.METERING_AREA); } + if (mMaxZoomRatio > CameraCapabilities.ZOOM_RATIO_UNZOOMED) { + mSupportedFeatures.add(Feature.ZOOM); + } + // TODO: Detect other features } |