summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/FocusOverlayManager.java
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-09-25 12:22:08 -0700
committerDoris Liu <tianliu@google.com>2013-09-25 12:25:49 -0700
commitb3749f2071f866c43ea5f70de219f23157097077 (patch)
tree1afac24c694d487d1c89ca63cb08d309c7f2da3e /src/com/android/camera/FocusOverlayManager.java
parent4863db01e3629a0a29c718b94445332ef74441e9 (diff)
downloadandroid_packages_apps_Snap-b3749f2071f866c43ea5f70de219f23157097077.tar.gz
android_packages_apps_Snap-b3749f2071f866c43ea5f70de219f23157097077.tar.bz2
android_packages_apps_Snap-b3749f2071f866c43ea5f70de219f23157097077.zip
Increase ROI size to 1/8 of the image width
Bug: 10863323 Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20
Diffstat (limited to 'src/com/android/camera/FocusOverlayManager.java')
-rw-r--r--src/com/android/camera/FocusOverlayManager.java14
1 files changed, 10 insertions, 4 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;
}