aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-05-30 22:47:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-30 22:47:20 -0700
commitc6791d6773f34990e9aac8f7219be82fa91ab92e (patch)
treedfbd9e8fcb22f5a516cb40ef2ec051c442ad0976 /java/src
parent30ec232b635e96a6dcc9d897df2e4596360b317f (diff)
parent60ee192b07a9725e97b3105acfc1eea5f5f25b9f (diff)
downloadlatinime-c6791d6773f34990e9aac8f7219be82fa91ab92e.tar.gz
latinime-c6791d6773f34990e9aac8f7219be82fa91ab92e.tar.xz
latinime-c6791d6773f34990e9aac8f7219be82fa91ab92e.zip
am 60ee192b: Utilize Rect\'s method
* commit '60ee192b07a9725e97b3105acfc1eea5f5f25b9f': Utilize Rect's method
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/ProximityInfo.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
index 9d8bace71..1207c3fcd 100644
--- a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
+++ b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
@@ -168,15 +168,13 @@ public class ProximityInfo {
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);
}