nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am bef6a4e2: Cleanup key definitions a bit 

* commit 'bef6a4e20965a8e664ee92b3c75405a6754afb4e':
  Cleanup key definitions a bit
main
Tadashi G. Takaoka 2014-03-16 18:53:08 -07:00 committed by Android Git Automerger
parent 7f09acb355 bef6a4e209
commit 32c57d69ab
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/src/com/android/inputmethod/keyboard/layout/Hindi.java
View File

@ -77,8 +77,7 @@ public final class Hindi extends LayoutBase {
// U+20B9: "₹" INDIAN RUPEE SIGN
private static final ExpectedKey CURRENCY_HINDI = key("\u20B9",
Symbols.DOLLAR_SIGN, Symbols.CENT_SIGN, Symbols.EURO_SIGN, Symbols.POUND_SIGN,
Symbols.YEN_SIGN, Symbols.PESO_SIGN);
Symbols.CURRENCY_GENERIC_MORE_KEYS);
}
@Override

3
tests/src/com/android/inputmethod/keyboard/layout/LayoutBase.java
View File

@ -265,7 +265,8 @@ public abstract class LayoutBase extends AbstractLayoutBase {
key("!", moreKey("\u00A1")), key("?", moreKey("\u00BF")));
// U+200C: ZERO WIDTH NON-JOINER
// U+200D: ZERO WIDTH JOINER
static final ExpectedKey ZWNJ_ZWJ_KEY = key(ICON_ZWNJ, "\u200C", moreKey(ICON_ZWJ, "\u200D"));
static final ExpectedKey ZWNJ_KEY = key(ICON_ZWNJ, "\u200C");
static final ExpectedKey ZWJ_KEY = key(ICON_ZWJ, "\u200D");
// Punctuation more keys for phone form factor.
public static final ExpectedKey[] PHONE_PUNCTUATION_MORE_KEYS = joinKeys(

2
tests/src/com/android/inputmethod/keyboard/layout/NepaliRomanized.java
View File

@ -45,7 +45,7 @@ public final class NepaliRomanized extends LayoutBase {
@Override
public ExpectedKey[] getSpaceKeys(final boolean isPhone) {
return joinKeys(SPACE_KEY, ZWNJ_ZWJ_KEY);
return joinKeys(SPACE_KEY, key(ZWNJ_KEY, ZWJ_KEY));
}
// U+0930/U+0941/U+002E "रु." NEPALESE RUPEE SIGN

3
tests/src/com/android/inputmethod/keyboard/layout/Symbols.java
View File

@ -74,6 +74,9 @@ public class Symbols extends AbstractLayoutBase {
CENT_SIGN, POUND_SIGN, EURO_SIGN, YEN_SIGN, PESO_SIGN);
public static final ExpectedKey CURRENCY_EURO = key("\u20AC",
CENT_SIGN, POUND_SIGN, DOLLAR_SIGN, YEN_SIGN, PESO_SIGN);
public static final ExpectedKey[] CURRENCY_GENERIC_MORE_KEYS = joinMoreKeys(
Symbols.DOLLAR_SIGN, Symbols.CENT_SIGN, Symbols.EURO_SIGN, Symbols.POUND_SIGN,
Symbols.YEN_SIGN, Symbols.PESO_SIGN);
// Variations of the "double quote" key's "more keys" on the 3rd row.
public static final String DOUBLE_QUOTE = "DOUBLE_QUOTE";

3
tests/src/com/android/inputmethod/keyboard/layout/Thai.java
View File

@ -61,8 +61,7 @@ public final class Thai extends LayoutBase {
// U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT
private static final ExpectedKey CURRENCY_BAHT = key("\u0E3F",
Symbols.DOLLAR_SIGN, Symbols.CENT_SIGN, Symbols.EURO_SIGN, Symbols.POUND_SIGN,
Symbols.YEN_SIGN, Symbols.PESO_SIGN);
Symbols.CURRENCY_GENERIC_MORE_KEYS);
}
@Override

3
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUkrainian.java
View File

@ -58,8 +58,7 @@ public final class TestsUkrainian extends LayoutTestsBase {
// U+20B4: "₴" HRYVNIA SIGN
private static final ExpectedKey CURRENCY_HRYVNIA = key("\u20B4",
Symbols.DOLLAR_SIGN, Symbols.CENT_SIGN, Symbols.EURO_SIGN, Symbols.POUND_SIGN,
Symbols.YEN_SIGN, Symbols.PESO_SIGN);
Symbols.CURRENCY_GENERIC_MORE_KEYS);
@Override
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {

3
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsVietnamese.java
View File

@ -54,8 +54,7 @@ public final class TestsVietnamese extends LayoutTestsBase {
// U+20AB: "₫" DONG SIGN
private static final ExpectedKey CURRENCY_DONG = key("\u20AB",
Symbols.DOLLAR_SIGN, Symbols.CENT_SIGN, Symbols.EURO_SIGN, Symbols.POUND_SIGN,
Symbols.YEN_SIGN, Symbols.PESO_SIGN);
Symbols.CURRENCY_GENERIC_MORE_KEYS);
@Override
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {