Move focus overlay into generic_module.

  Bug: 12563457

Also cleans up the focus overlay API.

Change-Id: I8a63b7abf7cc9390cc709c275807b1d3d2e344a6

1 files changed, 6 insertions, 10 deletions

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 5a211cd90..d306cfc59 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -100,8 +100,8 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaSiz
         public void clearFocus();
         public void setFocusPosition(int x, int y);
         public void onFocusStarted();
-        public void onFocusSucceeded(boolean timeOut);
-        public void onFocusFailed(boolean timeOut);
+        public void onFocusSucceeded();
+        public void onFocusFailed();
         public void pauseFaceDetection();
         public void resumeFaceDetection();
     }
@@ -324,7 +324,7 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaSiz
             mUI.setFocusPosition(mPreviewRect.centerX(), mPreviewRect.centerY());
             mUI.onFocusStarted();
         } else if (!moving) {
-            mUI.onFocusSucceeded(true);
+            mUI.onFocusSucceeded();
         }
         mPreviousMoving = moving;
     }
@@ -353,10 +353,6 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaSiz
         calculateTapArea(x, y, 1.5f, mMeteringArea.get(0).rect);
     }
 
-    private void resetMeteringAreas() {
-        mMeteringArea = null;
-    }
-
     public void onSingleTapUp(int x, int y) {
         if (!mInitialized || mState == STATE_FOCUSING_SNAP_ON_FINISH) return;
 
@@ -504,11 +500,11 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaSiz
         } else {
             if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusMode)) {
                 // TODO: check HAL behavior and decide if this can be removed.
-                mUI.onFocusSucceeded(false);
+                mUI.onFocusSucceeded();
             } else if (mState == STATE_SUCCESS) {
-                mUI.onFocusSucceeded(false);
+                mUI.onFocusSucceeded();
             } else if (mState == STATE_FAIL) {
-                mUI.onFocusFailed(false);
+                mUI.onFocusFailed();
             }
         }
     }