From 11cdcf604cd97055f50f88f48b19b91b72346412 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 4 Nov 2014 18:53:28 +0900
Subject: [PATCH] Fix missing ZWNJ key of BengaliAkhhor keyboard
This CL also fixes the wrong script of Bengali Akkhor.
Change-Id: Id4af2ea160b4ef3cfd40ffc5984354bc60f0b7b7
---
java/res/xml-sw600dp/key_space_3kw.xml | 8 ++------
java/res/xml-sw600dp/key_space_7kw.xml | 8 ++------
java/res/xml/key_space_5kw.xml | 8 ++------
java/res/xml/keyboard_layout_set_bengali_akkhor.xml | 2 +-
.../inputmethod/keyboard/layout/tests/TestsBengaliBD.java | 5 +++++
5 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/java/res/xml-sw600dp/key_space_3kw.xml b/java/res/xml-sw600dp/key_space_3kw.xml
index 9932d342e3..8cc3a38a52 100644
--- a/java/res/xml-sw600dp/key_space_3kw.xml
+++ b/java/res/xml-sw600dp/key_space_3kw.xml
@@ -22,12 +22,8 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
- <!-- fa: Perisan
- kn: Kannada
- ne: Nepali
- te: Telugu -->
<case
- latin:languageCode="fa|kn|ne|te"
+ latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
latin:languageSwitchKeyEnabled="true"
>
<Key
@@ -39,7 +35,7 @@
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
- latin:languageCode="fa|kn|ne|te"
+ latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
latin:languageSwitchKeyEnabled="false"
>
<Key
diff --git a/java/res/xml-sw600dp/key_space_7kw.xml b/java/res/xml-sw600dp/key_space_7kw.xml
index 3311f812a4..61e076534b 100644
--- a/java/res/xml-sw600dp/key_space_7kw.xml
+++ b/java/res/xml-sw600dp/key_space_7kw.xml
@@ -22,12 +22,8 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
- <!-- fa: Perisan
- kn: Kannada
- ne: Nepali
- te: Telugu -->
<case
- latin:languageCode="fa|kn|ne|te"
+ latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
latin:languageSwitchKeyEnabled="true"
>
<Key
@@ -39,7 +35,7 @@
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
- latin:languageCode="fa|kn|ne|te"
+ latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
latin:languageSwitchKeyEnabled="false"
>
<Key
diff --git a/java/res/xml/key_space_5kw.xml b/java/res/xml/key_space_5kw.xml
index b1fe0bbeb2..692c245ffe 100644
--- a/java/res/xml/key_space_5kw.xml
+++ b/java/res/xml/key_space_5kw.xml
@@ -22,12 +22,8 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
- <!-- fa: Perisan
- kn: Kannada
- ne: Nepali
- te: Telugu -->
<case
- latin:languageCode="fa|kn|ne|te"
+ latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
latin:languageSwitchKeyEnabled="true"
>
<Key
@@ -39,7 +35,7 @@
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
- latin:languageCode="fa|kn|ne|te"
+ latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
latin:languageSwitchKeyEnabled="false"
>
<Key
diff --git a/java/res/xml/keyboard_layout_set_bengali_akkhor.xml b/java/res/xml/keyboard_layout_set_bengali_akkhor.xml
index b2b09b22d5..267064d469 100644
--- a/java/res/xml/keyboard_layout_set_bengali_akkhor.xml
+++ b/java/res/xml/keyboard_layout_set_bengali_akkhor.xml
@@ -19,7 +19,7 @@
-->
<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
- <Feature latin:supportedScript="devanagari" />
+ <Feature latin:supportedScript="bengali" />
<Element
latin:elementKeyboard="@xml/kbd_bengali_akkhor"
latin:elementName="alphabet"
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java
index 62625890e5..2d38c874d3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java
@@ -45,6 +45,11 @@ public final class TestsBengaliBD extends LayoutTestsBase {
return isPhone ? EMPTY_KEYS : EXCLAMATION_AND_QUESTION_MARKS;
}
+ @Override
+ public ExpectedKey[] getSpaceKeys(final boolean isPhone) {
+ return joinKeys(LANGUAGE_SWITCH_KEY, SPACE_KEY, key(ZWNJ_KEY, ZWJ_KEY));
+ }
+
@Override
public ExpectedKey getCurrencyKey() { return CURRENCY_RUPEE; }
--
GitLab