commit 0537d4f7abe9e137f626e5cff3fcf252bb04c626
author Doris Liu <tianliu@google.com> Wed Sep 25 20:59:17 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 25 20:59:17 2013 +0000
tree aa284a986cc1a957b731c7608e38ffa0c935e671
parent b998a491a5b24e710bc1711dbb00cbfa05273bf2
parent b3749f2071f866c43ea5f70de219f23157097077

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

src/com/android/camera/FocusOverlayManager.java

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index a41959b..d9addac 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -513,15 +513,21 @@
     }
 
     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;
     }

src/com/android/camera/PhotoController.java

diff --git a/src/com/android/camera/PhotoController.java b/src/com/android/camera/PhotoController.java
index f32d2d9..291b5df 100644
--- a/src/com/android/camera/PhotoController.java
+++ b/src/com/android/camera/PhotoController.java
@@ -54,7 +54,7 @@
 
     public void onCountDownFinished();
 
-    public void onScreenSizeChanged(int width, int height, int previewWidth, int previewHeight);
+    public void onScreenSizeChanged(int width, int height);
 
     public void updateCameraOrientation();
 

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 98b52dd..33c9333 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -514,7 +514,7 @@
     }
 
     @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);
     }
 

src/com/android/camera/PhotoUI.java

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 3f1a27d..3b4d04d 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -137,7 +137,8 @@
                 mPreviewWidth = width;
                 mPreviewHeight = height;
                 setTransformMatrix(width, height);
-                mController.onScreenSizeChanged(width, height, w, h);
+                mController.onScreenSizeChanged((int) mSurfaceTextureUncroppedWidth,
+                        (int) mSurfaceTextureUncroppedHeight);
             }
         }
     };