commit 60ee192b07a9725e97b3105acfc1eea5f5f25b9f
author Tadashi G. Takaoka <takaoka@google.com> Thu May 31 11:17:51 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu May 31 14:05:34 2012 +0900
tree 0cf460ef762c48c25cb2d6846fd0827c0b4462bc
parent a2cfb2e3b08df987f5a35971a471076d5a76d42a

Utilize Rect's method

Change-Id: Ia3df1baae4b92eca828c53c17f68ff26b25e525c

java/src/com/android/inputmethod/keyboard/ProximityInfo.java

diff --git a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
index 9d8bace..1207c3f 100644
--- a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
+++ b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
@@ -168,15 +168,13 @@
                 final Rect hitBox = key.mHitBox;
                 final int row = hitBox.top / mKeyHeight;
                 if (row < touchPositionCorrection.mRadii.length) {
-                    final float hitBoxCenterX = (hitBox.left + hitBox.right) * 0.5f;
-                    final float hitBoxCenterY = (hitBox.top + hitBox.bottom) * 0.5f;
-                    final float hitBoxWidth = hitBox.right - hitBox.left;
-                    final float hitBoxHeight = hitBox.bottom - hitBox.top;
+                    final int hitBoxWidth = hitBox.width();
+                    final int hitBoxHeight = hitBox.height();
                     final float x = touchPositionCorrection.mXs[row];
                     final float y = touchPositionCorrection.mYs[row];
                     final float radius = touchPositionCorrection.mRadii[row];
-                    sweetSpotCenterXs[i] = hitBoxCenterX + x * hitBoxWidth;
-                    sweetSpotCenterYs[i] = hitBoxCenterY + y * hitBoxHeight;
+                    sweetSpotCenterXs[i] = hitBox.exactCenterX() + x * hitBoxWidth;
+                    sweetSpotCenterYs[i] = hitBox.exactCenterY() + y * hitBoxHeight;
                     sweetSpotRadii[i] = radius * FloatMath.sqrt(
                             hitBoxWidth * hitBoxWidth + hitBoxHeight * hitBoxHeight);
                 }