aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-03-19 20:59:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-19 20:59:02 -0700
commit85148376ba2a97fa4ffb0849cb88eef13e86bed2 (patch)
tree8aa6a1b00e1cd4c9514738be29921226cff7e18a /tests/src
parent785e59613e4d415114e9988c22ea767114b39ba9 (diff)
parent89f1b72793906d380b1fd062fa04c1e5a74f63fa (diff)
downloadlatinime-85148376ba2a97fa4ffb0849cb88eef13e86bed2.tar.gz
latinime-85148376ba2a97fa4ffb0849cb88eef13e86bed2.tar.xz
latinime-85148376ba2a97fa4ffb0849cb88eef13e86bed2.zip
am 89f1b727: Merge "Remove Latin comma from Arabic/Persian keyboard"
* commit '89f1b72793906d380b1fd062fa04c1e5a74f63fa': Remove Latin comma from Arabic/Persian keyboard
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/inputmethod/keyboard/layout/Arabic.java6
-rw-r--r--tests/src/com/android/inputmethod/keyboard/layout/Farsi.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java b/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java
index 838f98768..b0493d3f1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java
@@ -72,7 +72,7 @@ public final class Arabic extends LayoutBase {
public ExpectedKey[] getKeysLeftToSpacebar(final boolean isPhone) {
if (isPhone) {
// U+060C: "،" ARABIC COMMA
- return joinKeys(key("\u060C", joinMoreKeys(",", SETTINGS_KEY)));
+ return joinKeys(key("\u060C", SETTINGS_KEY));
}
return super.getKeysLeftToSpacebar(isPhone);
}
@@ -312,7 +312,7 @@ public final class Arabic extends LayoutBase {
// U+00BF: "¿" INVERTED QUESTION MARK
.replaceKeyOfLabel("?", key("\u061F", joinMoreKeys("?", "\u00BF")))
// U+060C: "،" ARABIC COMMA
- .replaceKeyOfLabel(",", key("\u060C", moreKey(",")))
+ .replaceKeyOfLabel(",", "\u060C")
// U+FD3E: "﴾" ORNATE LEFT PARENTHESIS
// U+FD3F: "﴿" ORNATE RIGHT PARENTHESIS
.replaceKeyOfLabel("(", key("(", ")",
@@ -342,7 +342,7 @@ public final class Arabic extends LayoutBase {
// U+266A: "♪" EIGHTH NOTE
.setMoreKeysOf("\u2022", "\u266A")
// U+060C: "،" ARABIC COMMA
- .replaceKeyOfLabel(",", key("\u060C", moreKey(",")))
+ .replaceKeyOfLabel(",", "\u060C")
.build();
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Farsi.java b/tests/src/com/android/inputmethod/keyboard/layout/Farsi.java
index 6da817fd9..a0070891a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Farsi.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Farsi.java
@@ -70,7 +70,7 @@ public final class Farsi extends LayoutBase {
public ExpectedKey[] getKeysLeftToSpacebar(final boolean isPhone) {
if (isPhone) {
// U+060C: "،" ARABIC COMMA
- return joinKeys(key("\u060C", joinMoreKeys(",", SETTINGS_KEY)));
+ return joinKeys(key("\u060C", SETTINGS_KEY));
}
return super.getKeysLeftToSpacebar(isPhone);
}
@@ -315,7 +315,7 @@ public final class Farsi extends LayoutBase {
// U+00BF: "¿" INVERTED QUESTION MARK
.replaceKeyOfLabel("?", key("\u061F", joinMoreKeys("?", "\u00BF")))
// U+060C: "،" ARABIC COMMA
- .replaceKeyOfLabel(",", key("\u060C", moreKey(",")))
+ .replaceKeyOfLabel(",", "\u060C")
// U+FD3E: "﴾" ORNATE LEFT PARENTHESIS
// U+FD3F: "﴿" ORNATE RIGHT PARENTHESIS
.replaceKeyOfLabel("(", key("(", ")",
@@ -345,7 +345,7 @@ public final class Farsi extends LayoutBase {
// U+266A: "♪" EIGHTH NOTE
.setMoreKeysOf("\u2022", "\u266A")
// U+060C: "،" ARABIC COMMA
- .replaceKeyOfLabel(",", key("\u060C", moreKey(",")))
+ .replaceKeyOfLabel(",", "\u060C")
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
// U+2264: "≤" LESS-THAN OR EQUAL TO