Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad

4 files changed, 14 insertions, 7 deletions

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index a41959b08..d9addac48 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -513,15 +513,21 @@ public class FocusOverlayManager {
     }
 
     private void calculateTapArea(int x, int y, float areaMultiple, Rect rect) {
-        int areaSize = (int) (Math.min(mPreviewWidth, mPreviewHeight) * areaMultiple / 20);
-        int left = CameraUtil.clamp(x - areaSize, 0, mPreviewWidth - 2 * areaSize);
-        int top = CameraUtil.clamp(y - areaSize, 0, mPreviewHeight - 2 * areaSize);
+        int areaSize = (int) (getAreaSize() * areaMultiple);
+        int left = CameraUtil.clamp(x - areaSize / 2, 0, mPreviewWidth - areaSize);
+        int top = CameraUtil.clamp(y - areaSize / 2, 0, mPreviewHeight - areaSize);
 
-        RectF rectF = new RectF(left, top, left + 2 * areaSize, top + 2 * areaSize);
+        RectF rectF = new RectF(left, top, left + areaSize, top + areaSize);
         mMatrix.mapRect(rectF);
         CameraUtil.rectFToRect(rectF, rect);
     }
 
+    private int getAreaSize() {
+        // Recommended focus area size from the manufacture is 1/8 of the image
+        // width
+        return Math.min(mPreviewWidth, mPreviewHeight) / 8;
+    }
+
     /* package */ int getFocusState() {
         return mState;
     }
diff --git a/src/com/android/camera/PhotoController.java b/src/com/android/camera/PhotoController.java
index f32d2d967..291b5df49 100644
--- a/src/com/android/camera/PhotoController.java
+++ b/src/com/android/camera/PhotoController.java
@@ -54,7 +54,7 @@ public interface PhotoController extends OnShutterButtonListener {
 
     public void onCountDownFinished();
 
-    public void onScreenSizeChanged(int width, int height, int previewWidth, int previewHeight);
+    public void onScreenSizeChanged(int width, int height);
 
     public void updateCameraOrientation();
 
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 98b52dded..33c9333cd 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -514,7 +514,7 @@ public class PhotoModule
     }
 
     @Override
-    public void onScreenSizeChanged(int width, int height, int previewWidth, int previewHeight) {
+    public void onScreenSizeChanged(int width, int height) {
         if (mFocusManager != null) mFocusManager.setPreviewSize(width, height);
     }
 
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 3f1a27ddf..3b4d04dc7 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -137,7 +137,8 @@ public class PhotoUI implements PieListener,
                 mPreviewWidth = width;
                 mPreviewHeight = height;
                 setTransformMatrix(width, height);
-                mController.onScreenSizeChanged(width, height, w, h);
+                mController.onScreenSizeChanged((int) mSurfaceTextureUncroppedWidth,
+                        (int) mSurfaceTextureUncroppedHeight);
             }
         }
     };