Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11cdcf60 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix missing ZWNJ key of BengaliAkhhor keyboard 

This CL also fixes the wrong script of Bengali Akkhor.

Change-Id: Id4af2ea160b4ef3cfd40ffc5984354bc60f0b7b7
parent c514d3ea

java/res/xml-sw600dp/key_space_3kw.xml

+2 −6
Original line number Diff line number Diff line
@@ -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

java/res/xml-sw600dp/key_space_7kw.xml

+2 −6
Original line number Diff line number Diff line
@@ -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

java/res/xml/key_space_5kw.xml

+2 −6
Original line number Diff line number Diff line
@@ -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

java/res/xml/keyboard_layout_set_bengali_akkhor.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java

+5 −0
Original line number Diff line number Diff line
@@ -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; }