diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-09-18 14:28:51 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-09-18 14:32:55 -0700 |
commit | 638e6f06c877d90b907f66ea9c22b3c6b73c7384 (patch) | |
tree | 6d2123a6d02228f867ccc6f7e51e2a658b2092d5 /src/com/android/camera/PhotoModule.java | |
parent | 4ed20592482d2ab2f3f48ee72d5b1c06bf009034 (diff) | |
download | android_packages_apps_Snap-638e6f06c877d90b907f66ea9c22b3c6b73c7384.tar.gz android_packages_apps_Snap-638e6f06c877d90b907f66ea9c22b3c6b73c7384.tar.bz2 android_packages_apps_Snap-638e6f06c877d90b907f66ea9c22b3c6b73c7384.zip |
Clean up ApiHelper and remove unused code paths.
Bug: 10821545
As we're targeting ICS there are a lot of checks and code paths
that are no longer in use. This CL cleans them up.
Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index e3bdc25fe..861dead2d 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -38,6 +38,7 @@ import android.hardware.SensorManager; import android.location.Location; import android.media.CameraProfile; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -481,11 +482,9 @@ public class PhotoModule mZoomValue = 0; openCameraCommon(); - if (ApiHelper.HAS_SURFACE_TEXTURE) { - // Start switch camera animation. Post a message because - // onFrameAvailable from the old camera may already exist. - mHandler.sendEmptyMessage(SWITCH_CAMERA_START_ANIMATION); - } + // Start switch camera animation. Post a message because + // onFrameAvailable from the old camera may already exist. + mHandler.sendEmptyMessage(SWITCH_CAMERA_START_ANIMATION); } protected void setCameraId(int cameraId) { @@ -594,10 +593,8 @@ public class PhotoModule }); } - @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) @Override public void startFaceDetection() { - if (!ApiHelper.HAS_FACE_DETECTION) return; if (mFaceDetectionStarted) return; if (mParameters.getMaxNumDetectedFaces() > 0) { mFaceDetectionStarted = true; @@ -609,10 +606,8 @@ public class PhotoModule } } - @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) @Override public void stopFaceDetection() { - if (!ApiHelper.HAS_FACE_DETECTION) return; if (!mFaceDetectionStarted) return; if (mParameters.getMaxNumDetectedFaces() > 0) { mFaceDetectionStarted = false; @@ -710,14 +705,7 @@ public class PhotoModule mFocusManager.updateFocusUI(); // Ensure focus indicator is hidden. if (!mIsImageCaptureIntent) { - if (ApiHelper.CAN_START_PREVIEW_IN_JPEG_CALLBACK) { - setupPreview(); - } else { - // Camera HAL of some devices have a bug. Starting preview - // immediately after taking a picture will fail. Wait some - // time before starting the preview. - mHandler.sendEmptyMessageDelayed(SETUP_PREVIEW, 300); - } + setupPreview(); } ExifInterface exif = Exif.getExif(jpegData); @@ -792,7 +780,7 @@ public class PhotoModule } } - @TargetApi(ApiHelper.VERSION_CODES.JELLY_BEAN) + @TargetApi(Build.VERSION_CODES.JELLY_BEAN) private final class AutoFocusMoveCallback implements CameraAFMoveCallback { @Override @@ -1446,13 +1434,10 @@ public class PhotoModule return false; } - @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) private void closeCamera() { if (mCameraDevice != null) { mCameraDevice.setZoomChangeListener(null); - if(ApiHelper.HAS_FACE_DETECTION) { - mCameraDevice.setFaceDetectionCallback(null, null); - } + mCameraDevice.setFaceDetectionCallback(null, null); mCameraDevice.setErrorCallback(null); CameraHolder.instance().release(); mFaceDetectionStarted = false; @@ -1566,28 +1551,26 @@ public class PhotoModule } } - @TargetApi(ApiHelper.VERSION_CODES.JELLY_BEAN) + @TargetApi(Build.VERSION_CODES.JELLY_BEAN) private void setAutoExposureLockIfSupported() { if (mAeLockSupported) { mParameters.setAutoExposureLock(mFocusManager.getAeAwbLock()); } } - @TargetApi(ApiHelper.VERSION_CODES.JELLY_BEAN) + @TargetApi(Build.VERSION_CODES.JELLY_BEAN) private void setAutoWhiteBalanceLockIfSupported() { if (mAwbLockSupported) { mParameters.setAutoWhiteBalanceLock(mFocusManager.getAeAwbLock()); } } - @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) private void setFocusAreasIfSupported() { if (mFocusAreaSupported) { mParameters.setFocusAreas(mFocusManager.getFocusAreas()); } } - @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) private void setMeteringAreasIfSupported() { if (mMeteringAreaSupported) { // Use the same area for focus and metering. @@ -1723,7 +1706,7 @@ public class PhotoModule } } - @TargetApi(ApiHelper.VERSION_CODES.JELLY_BEAN) + @TargetApi(Build.VERSION_CODES.JELLY_BEAN) private void updateAutoFocusMoveCallback() { if (mParameters.getFocusMode().equals(CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE)) { mCameraDevice.setAutoFocusMoveCallback(mHandler, |