From 6a001f58da80b18bf9c6c4baa1936033f2674710 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 20 Aug 2009 18:35:30 -0700
Subject: [PATCH] Tweak spacebar target area between landscape and portrait.

---
 res/values-land/dimens.xml                        |  1 +
 res/values/dimens.xml                             |  1 +
 .../android/inputmethod/latin/LatinKeyboard.java  | 15 +++++++++------
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 9e9e30f3c..43951552e 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -21,4 +21,5 @@
 <resources>
     <dimen name="key_height">47dip</dimen>
     <dimen name="candidate_strip_height">38dip</dimen>
+    <dimen name="spacebar_vertical_correction">2dip</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2359341c3..5b2095c0e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,4 +22,5 @@
     <dimen name="key_height">54dip</dimen>
     <dimen name="bubble_pointer_offset">22dip</dimen>
     <dimen name="candidate_strip_height">42dip</dimen>
+    <dimen name="spacebar_vertical_correction">4dip</dimen>
 </resources>
\ No newline at end of file
diff --git a/src/com/android/inputmethod/latin/LatinKeyboard.java b/src/com/android/inputmethod/latin/LatinKeyboard.java
index 619a18680..9b04aa264 100644
--- a/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -37,20 +37,23 @@ public class LatinKeyboard extends Keyboard {
     private static final int SHIFT_LOCKED = 2;
     
     private int mShiftState = SHIFT_OFF;
-    
+
+    static int sSpacebarVerticalCorrection;
+
     public LatinKeyboard(Context context, int xmlLayoutResId) {
         this(context, xmlLayoutResId, 0);
     }
 
     public LatinKeyboard(Context context, int xmlLayoutResId, int mode) {
         super(context, xmlLayoutResId, mode);
-        mShiftLockIcon = context.getResources()
-                .getDrawable(R.drawable.sym_keyboard_shift_locked);
-        mShiftLockPreviewIcon = context.getResources()
-                .getDrawable(R.drawable.sym_keyboard_feedback_shift_locked);
+        Resources res = context.getResources();
+        mShiftLockIcon = res.getDrawable(R.drawable.sym_keyboard_shift_locked);
+        mShiftLockPreviewIcon = res.getDrawable(R.drawable.sym_keyboard_feedback_shift_locked);
         mShiftLockPreviewIcon.setBounds(0, 0, 
                 mShiftLockPreviewIcon.getIntrinsicWidth(),
                 mShiftLockPreviewIcon.getIntrinsicHeight());
+        sSpacebarVerticalCorrection = res.getDimensionPixelOffset(
+                R.dimen.spacebar_vertical_correction);
     }
 
     public LatinKeyboard(Context context, int layoutTemplateResId, 
@@ -226,7 +229,7 @@ public class LatinKeyboard extends Keyboard {
                 if (code == KEYCODE_SHIFT) x += width / 6;
                 if (code == KEYCODE_DELETE) x -= width / 6;
             } else if (code == LatinIME.KEYCODE_SPACE) {
-                y += 5;
+                y += LatinKeyboard.sSpacebarVerticalCorrection;
             }
             return super.isInside(x, y);
         }