diff options
| -rw-r--r-- | java/res/values-sw540dp-land/config.xml (renamed from java/res/values-sw600dp-land/config.xml) | 0 | ||||
| -rw-r--r-- | java/res/values-sw540dp-land/dimens.xml (renamed from java/res/values-sw600dp-land/dimens.xml) | 0 | ||||
| -rw-r--r-- | java/res/values-sw540dp/config.xml (renamed from java/res/values-sw600dp/config.xml) | 0 | ||||
| -rw-r--r-- | java/res/values-sw540dp/dimens.xml (renamed from java/res/values-sw600dp/dimens.xml) | 0 | ||||
| -rw-r--r-- | java/res/values-sw540dp/touch-position-correction.xml (renamed from java/res/values-sw600dp/touch-position-correction.xml) | 0 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java | 2 | ||||
| -rw-r--r-- | tools/make-keyboard-text/res/values/donottranslate-more-keys.xml | 2 |
8 files changed, 4 insertions, 4 deletions
diff --git a/java/res/values-sw600dp-land/config.xml b/java/res/values-sw540dp-land/config.xml index b3cd7278d..b3cd7278d 100644 --- a/java/res/values-sw600dp-land/config.xml +++ b/java/res/values-sw540dp-land/config.xml diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw540dp-land/dimens.xml index d79e8ca35..d79e8ca35 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw540dp-land/dimens.xml diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw540dp/config.xml index 93862a767..93862a767 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw540dp/config.xml diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw540dp/dimens.xml index b2f4ae043..b2f4ae043 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw540dp/dimens.xml diff --git a/java/res/values-sw600dp/touch-position-correction.xml b/java/res/values-sw540dp/touch-position-correction.xml index df07c1295..df07c1295 100644 --- a/java/res/values-sw600dp/touch-position-correction.xml +++ b/java/res/values-sw540dp/touch-position-correction.xml diff --git a/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java b/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java index 09766ac6c..3133e54be 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java +++ b/java/src/com/android/inputmethod/keyboard/internal/DynamicGridKeyboard.java @@ -184,12 +184,12 @@ public class DynamicGridKeyboard extends Keyboard { private int getKeyY0(final int index) { final int row = index / mColumnsNum; - return row * mVerticalStep; + return row * mVerticalStep + mVerticalGap / 2; } private int getKeyY1(final int index) { final int row = index / mColumnsNum + 1; - return row * mVerticalStep; + return row * mVerticalStep + mVerticalGap / 2; } @Override diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index bcb80b455..e769e3cdd 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -278,7 +278,7 @@ public final class KeyboardTextsSet { /* 50 */ "\u00A2,\u00A3,\u20AC,\u00A5,\u20B1", /* 51 */ "$", /* 52 */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1", - /* 53 */ "!fixedColumnOrder!3,!,\\,,?,:,;,@", + /* 53 */ "!fixedColumnOrder!4,#,!,\\,,?,-,:,',@", // U+2020: "†" DAGGER // U+2021: "‡" DOUBLE DAGGER // U+2605: "★" BLACK STAR diff --git a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml index 39ecfab22..64396b1dd 100644 --- a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml @@ -77,7 +77,7 @@ <string name="more_keys_for_currency_dollar">¢,£,€,¥,₱</string> <string name="keylabel_for_currency">$</string> <string name="more_keys_for_currency">$,¢,€,£,¥,₱</string> - <string name="more_keys_for_punctuation">"!fixedColumnOrder!3,!,\\,,\?,:,;,\@"</string> + <string name="more_keys_for_punctuation">"!fixedColumnOrder!4,#,!,\\,,\?,-,:,',\@"</string> <!-- U+2020: "†" DAGGER U+2021: "‡" DOUBLE DAGGER U+2605: "★" BLACK STAR --> |