From ffa3fdd8197b3b3c115d7c779e6bf968bbe06d21 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Wed, 19 Aug 2009 15:16:33 -0700 Subject: [PATCH] Keyboard layout improvements. Increase key height in portrait. Increase spacebar width and reduce punctuation width. Increase vertical target area for spacebar to avoid accidentally hitting "V" and "B". Increase height of candidate strip. --- .../keyboard_suggest_strip_divider.png | Bin 166 -> 2846 bytes res/layout/candidates.xml | 2 +- res/values-land/dimens.xml | 1 + res/values/dimens.xml | 3 +- res/xml-de/kbd_qwerty.xml | 39 +++++++------- res/xml-fr/kbd_qwerty.xml | 22 ++++---- res/xml/kbd_qwerty.xml | 48 +++++++++--------- res/xml/kbd_symbols.xml | 15 +++--- res/xml/kbd_symbols_shift.xml | 12 +++-- .../inputmethod/latin/LatinKeyboard.java | 2 + 10 files changed, 75 insertions(+), 69 deletions(-) diff --git a/res/drawable/keyboard_suggest_strip_divider.png b/res/drawable/keyboard_suggest_strip_divider.png index e54c5b099431be9853118c033e6fee440e44aa61..c9413d7c147a56adb8ddc31ad5bee47d764f6f7e 100644 GIT binary patch literal 2846 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 CjW)^v diff --git a/res/layout/candidates.xml b/res/layout/candidates.xml index edd779a81..39df81dd2 100755 --- a/res/layout/candidates.xml +++ b/res/layout/candidates.xml @@ -50,7 +50,7 @@ diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index c5c828ef6..9e9e30f3c 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -20,4 +20,5 @@ 47dip + 38dip \ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d757f096d..2359341c3 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -19,6 +19,7 @@ --> - 50dip + 54dip 22dip + 42dip \ No newline at end of file diff --git a/res/xml-de/kbd_qwerty.xml b/res/xml-de/kbd_qwerty.xml index 89e53efc8..0c0d20e2f 100755 --- a/res/xml-de/kbd_qwerty.xml +++ b/res/xml-de/kbd_qwerty.xml @@ -69,7 +69,7 @@ - @@ -89,30 +89,30 @@ android:popupCharacters="@string/alternates_for_n" /> - - - - + + android:keyWidth="40%p" android:isRepeatable="true"/> - + - @@ -120,12 +120,12 @@ android:popupKeyboard="@xml/popup_domains" android:keyWidth="15%p"/> - - - @@ -140,28 +140,27 @@ - - - - - + + android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="10%p"/> - \ No newline at end of file diff --git a/res/xml-fr/kbd_qwerty.xml b/res/xml-fr/kbd_qwerty.xml index 573f08a3b..1e72d22a2 100644 --- a/res/xml-fr/kbd_qwerty.xml +++ b/res/xml-fr/kbd_qwerty.xml @@ -102,12 +102,12 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="" android:keyWidth="20%p" android:keyEdgeFlags="left"/> - + + android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="10%p"/> @@ -142,24 +142,24 @@ - - - - - + - + android:keyWidth="40%p" android:isRepeatable="true"/> + diff --git a/res/xml/kbd_qwerty.xml b/res/xml/kbd_qwerty.xml index 8d64d3e52..41625f2ab 100755 --- a/res/xml/kbd_qwerty.xml +++ b/res/xml/kbd_qwerty.xml @@ -100,8 +100,8 @@ android:popupCharacters="@string/alternates_for_n" /> - @@ -111,19 +111,19 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="_" android:keyWidth="20%p" android:keyEdgeFlags="left"/> - - + + android:keyWidth="40%p" android:isRepeatable="true"/> - + - @@ -131,44 +131,44 @@ android:popupKeyboard="@xml/popup_domains" android:keyWidth="15%p"/> - - - - - - - + + - - + + - - - + + android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="10%p"/> diff --git a/res/xml/kbd_symbols.xml b/res/xml/kbd_symbols.xml index ecdf75137..f3b8833dc 100755 --- a/res/xml/kbd_symbols.xml +++ b/res/xml/kbd_symbols.xml @@ -94,10 +94,10 @@ - - @@ -119,18 +119,19 @@ - - - - + diff --git a/res/xml/kbd_symbols_shift.xml b/res/xml/kbd_symbols_shift.xml index fee845ecd..56428a3ad 100755 --- a/res/xml/kbd_symbols_shift.xml +++ b/res/xml/kbd_symbols_shift.xml @@ -55,7 +55,7 @@ - @@ -81,12 +81,14 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="_" android:keyEdgeFlags="left"/> - - + - - + diff --git a/src/com/android/inputmethod/latin/LatinKeyboard.java b/src/com/android/inputmethod/latin/LatinKeyboard.java index 8527d9cd5..619a18680 100644 --- a/src/com/android/inputmethod/latin/LatinKeyboard.java +++ b/src/com/android/inputmethod/latin/LatinKeyboard.java @@ -225,6 +225,8 @@ public class LatinKeyboard extends Keyboard { y -= height / 10; if (code == KEYCODE_SHIFT) x += width / 6; if (code == KEYCODE_DELETE) x -= width / 6; + } else if (code == LatinIME.KEYCODE_SPACE) { + y += 5; } return super.isInside(x, y); }