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/util/CameraUtil.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/util/CameraUtil.java')
-rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 61 |
1 files changed, 19 insertions, 42 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index adaaaa776..2ca32f0bb 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -16,16 +16,6 @@ package com.android.camera.util; -import java.io.Closeable; -import java.io.IOException; -import java.lang.reflect.Method; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Locale; -import java.util.StringTokenizer; - -import android.annotation.TargetApi; import android.app.Activity; import android.app.AlertDialog; import android.app.admin.DevicePolicyManager; @@ -47,15 +37,12 @@ import android.hardware.Camera.Parameters; import android.hardware.Camera.Size; import android.location.Location; import android.net.Uri; -import android.os.Build; import android.os.Handler; import android.os.ParcelFileDescriptor; import android.telephony.TelephonyManager; import android.util.DisplayMetrics; -import android.util.FloatMath; import android.util.Log; import android.util.TypedValue; -import android.view.Display; import android.view.OrientationEventListener; import android.view.Surface; import android.view.View; @@ -66,11 +53,19 @@ import android.widget.Toast; import com.android.camera.CameraActivity; import com.android.camera.CameraDisabledException; -import com.android.camera.CameraHardwareException; import com.android.camera.CameraHolder; import com.android.camera.CameraManager; import com.android.camera2.R; +import java.io.Closeable; +import java.io.IOException; +import java.lang.reflect.Method; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.StringTokenizer; + /** * Collection of utility functions used in this package. */ @@ -138,22 +133,14 @@ public class CameraUtil { return (supported != null) && supported.contains(SCENE_MODE_HDR); } - @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public static boolean isMeteringAreaSupported(Parameters params) { - if (ApiHelper.HAS_CAMERA_METERING_AREA) { - return params.getMaxNumMeteringAreas() > 0; - } - return false; + return params.getMaxNumMeteringAreas() > 0; } - @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) public static boolean isFocusAreaSupported(Parameters params) { - if (ApiHelper.HAS_CAMERA_FOCUS_AREA) { - return (params.getMaxNumFocusAreas() > 0 - && isSupported(Parameters.FOCUS_MODE_AUTO, - params.getSupportedFocusModes())); - } - return false; + return (params.getMaxNumFocusAreas() > 0 + && isSupported(Parameters.FOCUS_MODE_AUTO, + params.getSupportedFocusModes())); } // Private intent extras. Test only. @@ -325,15 +312,12 @@ public class CameraUtil { } } - @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH) private static void throwIfCameraDisabled(Activity activity) throws CameraDisabledException { // Check if device policy has disabled the camera. - if (ApiHelper.HAS_GET_CAMERA_DISABLED) { - DevicePolicyManager dpm = (DevicePolicyManager) activity.getSystemService( - Context.DEVICE_POLICY_SERVICE); - if (dpm.getCameraDisabled(null)) { - throw new CameraDisabledException(); - } + DevicePolicyManager dpm = (DevicePolicyManager) activity.getSystemService( + Context.DEVICE_POLICY_SERVICE); + if (dpm.getCameraDisabled(null)) { + throw new CameraDisabledException(); } } @@ -395,7 +379,7 @@ public class CameraUtil { public static float distance(float x, float y, float sx, float sy) { float dx = x - sx; float dy = y - sy; - return FloatMath.sqrt(dx * dx + dy * dy); + return (float) Math.sqrt(dx * dx + dy * dy); } public static int clamp(int x, int min, int max) { @@ -452,15 +436,8 @@ public class CameraUtil { return orientationHistory; } - @SuppressWarnings("deprecation") - @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2) private static Point getDefaultDisplaySize(Activity activity, Point size) { - Display d = activity.getWindowManager().getDefaultDisplay(); - if (Build.VERSION.SDK_INT >= ApiHelper.VERSION_CODES.HONEYCOMB_MR2) { - d.getSize(size); - } else { - size.set(d.getWidth(), d.getHeight()); - } + activity.getWindowManager().getDefaultDisplay().getSize(size); return size; } |