diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-03-09 17:54:54 -0800 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2016-03-30 15:55:15 -0700 |
commit | ecbee10d740381d11df172de027ef76a6136ace3 (patch) | |
tree | c211caa8691209e7e78d5bdbb7c5c614a4460b9f /src/com/android/camera/util | |
parent | 0095c4455f5bba6352abe0476948ef99b42a0c96 (diff) | |
download | android_packages_apps_Snap-ecbee10d740381d11df172de027ef76a6136ace3.tar.gz android_packages_apps_Snap-ecbee10d740381d11df172de027ef76a6136ace3.tar.bz2 android_packages_apps_Snap-ecbee10d740381d11df172de027ef76a6136ace3.zip |
SnapdragonCamera: Camera2 add touch to focus
Add touch to focus to Camera2
CRs-Fixed: 989750
Change-Id: I5c7c85dcc12eefb11e5f1b5e6a823a327b2647e4
Diffstat (limited to 'src/com/android/camera/util')
-rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index be66091e2..b1deca6e0 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -1171,13 +1171,30 @@ public class CameraUtil { public static boolean isZoomSupported(CameraCharacteristics[] characteristics, List<Integer> characteristicsIndex) { - boolean supported = true; + for (int i = 0; i < characteristicsIndex.size(); i++) { + if (!isZoomSupported(characteristics[characteristicsIndex.get(i)])) + return false; + } + return true; + } + public static boolean isZoomSupported(CameraCharacteristics characteristic) { + return characteristic.get(CameraCharacteristics + .SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) > 1f; + } + + public static boolean isAutoFocusSupported(CameraCharacteristics[] characteristics, List<Integer> + characteristicsIndex) { for (int i = 0; i < characteristicsIndex.size(); i++) { - if (characteristics[characteristicsIndex.get(i)].get(CameraCharacteristics - .SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) <= 1f) + if (!isAutoFocusSupported(characteristics[characteristicsIndex.get(i)])) return false; } - return supported; + return true; + } + + public static boolean isAutoFocusSupported(CameraCharacteristics characteristic) { + Integer maxAfRegions = characteristic.get( + CameraCharacteristics.CONTROL_MAX_REGIONS_AF); + return maxAfRegions != null && maxAfRegions > 0; } } |