From 638e6f06c877d90b907f66ea9c22b3c6b73c7384 Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Wed, 18 Sep 2013 14:28:51 -0700
Subject: 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
---
 src/com/android/camera/FocusOverlayManager.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/com/android/camera/FocusOverlayManager.java')

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index d3215e7a6..a41959b08 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -16,23 +16,23 @@
 
 package com.android.camera;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.annotation.TargetApi;
 import android.graphics.Matrix;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.hardware.Camera.Area;
 import android.hardware.Camera.Parameters;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
 
-import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /* A class that handles everything about focus in still picture mode.
  * This also handles the metering area because it is the same as focus area.
  *
@@ -316,7 +316,7 @@ public class FocusOverlayManager {
         mPreviousMoving = moving;
     }
 
-    @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH)
+    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
     private void initializeFocusAreas(int x, int y) {
         if (mFocusArea == null) {
             mFocusArea = new ArrayList<Object>();
@@ -327,7 +327,7 @@ public class FocusOverlayManager {
         calculateTapArea(x, y, 1f, ((Area) mFocusArea.get(0)).rect);
     }
 
-    @TargetApi(ApiHelper.VERSION_CODES.ICE_CREAM_SANDWICH)
+    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
     private void initializeMeteringAreas(int x, int y) {
         if (mMeteringArea == null) {
             mMeteringArea = new ArrayList<Object>();
-- 
cgit v1.2.3