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

Commit 45c917e2 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Enable preliminary subtypes for F-release 

Bug: 17743363
Change-Id: I098ae6e21a7f2a1ceed1d206740a2d12e1ef7d99
parent 12493955

java/res/xml/method.xml

+7 −21
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    be_BY: Belarusian (Belarus)/east_slavic

    bg: Bulgarian/bulgarian

    bg: Bulgarian/bulgarian_bds

    (bn_BD: Bengali (Bangladesh)/bengali_akkhor) # This is a preliminary keyboard layout.

    bn_BD: Bengali (Bangladesh)/bengali_akkhor # This is a preliminary keyboard layout.

    bn_IN: Bengali (India)/bengali

    ca: Catalan/spanish

    cs: Czech/qwertz
@@ -53,7 +53,7 @@ 
    gl_ES: Galician (Spain)/spanish

    hi: Hindi/hindi

    hi: Hindi/hindi_compact

    (hi_ZZ: Hinglish/qwerty)  # This is a preliminary keyboard layout.

    hi_ZZ: Hinglish/qwerty  # This is a preliminary keyboard layout.

    hr: Croatian/qwertz

    hu: Hungarian/qwertz

    hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic
@@ -75,7 +75,7 @@ 
    mn_MN: Mongolian (Mongolia)/mongolian

    mr_IN: Marathi (India)/marathi

    ms_MY: Malay (Malaysia)/qwerty

    (my_MM: Myanmar (Myanmar)/myanmar) # This is a preliminary keyboard layout.

    my_MM: Myanmar (Myanmar)/myanmar # This is a preliminary keyboard layout.

    nb: Norwegian Bokmål/nordic

    ne_NP: Nepali (Nepal) Romanized/nepali_romanized

    ne_NP: Nepali (Nepal) Traditional/nepali_traditional
@@ -86,22 +86,22 @@ 
    pt_PT: Portuguese (Portugal)/qwerty

    ro: Romanian/qwerty

    ru: Russian/east_slavic

    (si_LK: Sinhala (Sri Lanka)/sinhala) # This is a preliminary keyboard layout.

    si_LK: Sinhala (Sri Lanka)/sinhala # This is a preliminary keyboard layout.

    sk: Slovak/qwerty

    sl: Slovenian/qwerty

    sr: Serbian/south_slavic

    (sr_ZZ: Serbian (Latin)/serbian_qwertz) # This is a preliminary keyboard layout.

    sr_ZZ: Serbian (Latin)/serbian_qwertz # This is a preliminary keyboard layout.

    sv: Swedish/nordic

    sw: Swahili/qwerty

    ta_IN: Tamil (India)/tamil

    (ta_LK: Tamil (Sri Lanka)/tamil) # Disabled in conjunction with si_LK.

    ta_LK: Tamil (Sri Lanka)/tamil # Disabled in conjunction with si_LK.

    ta_SG: Tamil (Singapore)/tamil

    te_IN: Telugu (India)/telugu

    th: Thai/thai

    tl: Tagalog/spanish

    tr: Turkish/qwerty

    uk: Ukrainian/east_slavic

    (uz_UZ: Uzbek (Uzbekistan)/uzbek) # This is a preliminary keyboard layout.

    uz_UZ: Uzbek (Uzbekistan)/uzbek # This is a preliminary keyboard layout.

    vi: Vietnamese/qwerty

    zu: Zulu/qwerty

    zz: QWERTY/qwerty
@@ -183,7 +183,6 @@ 
    />

    <!-- TODO: This Bengali (Bangladesh) keyboard is a preliminary layout.

               This isn't based on the final specification. -->

    <!--

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0xa2144b0c"
@@ -192,7 +191,6 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali_akkhor,EmojiCapable"

            android:isAsciiCapable="false"

    />

    -->

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0xbff5986c"
@@ -371,7 +369,6 @@ 
    />

    <!-- TODO: This Hinglish keyboard is a preliminary layout.

               This isn't based on the final specification. -->

    <!--

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_hi_ZZ"

            android:subtypeId="0x352eb37c"
@@ -380,7 +377,6 @@ 
            android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,EmojiCapable"

            android:isAsciiCapable="true"

    />

    -->

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x35b7526a"
@@ -553,7 +549,6 @@ 
    />

    <!-- TODO: This Myanmar keyboard is a preliminary layout.

               This isn't based on the final specification. -->

    <!--

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0xea266ea4"
@@ -562,7 +557,6 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable,CombiningRules=MyanmarReordering"

            android:isAsciiCapable="false"

    />

    -->

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x3f12ee14"
@@ -645,7 +639,6 @@ 
    />

    <!-- TODO: This Sinhala keyboard is a preliminary layout.

               This isn't based on the final specification. -->

    <!--

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x5c6b3bde"
@@ -654,7 +647,6 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable"

            android:isAsciiCapable="false"

    />

    -->

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x8e94d413"
@@ -681,7 +673,6 @@ 
    />

    <!-- TODO: This Serbian Latin keyboard is a preliminary layout.

               This isn't based on the final specification. -->

    <!--

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_sr_ZZ"

            android:subtypeId="0xf4a5569c"
@@ -690,7 +681,6 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=serbian_qwertz,AsciiCapable,EmojiCapable"

            android:isAsciiCapable="true"

    />

    -->

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x48b4ff43"
@@ -716,7 +706,6 @@ 
            android:isAsciiCapable="false"

    />

    <!-- TODO: Enabling/Disabling ta_LK subtype must be aligned with si_LK subtype. -->

    <!--

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x6ca12d84"
@@ -725,7 +714,6 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"

            android:isAsciiCapable="false"

    />

    -->

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x785abbd9"
@@ -776,7 +764,6 @@ 
    />

    <!-- TODO: This Uzbek keyboard is a preliminary layout.

               This isn't based on the final specification. -->

    <!--

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0xad5cf7f6"
@@ -785,7 +772,6 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=uzbek,AsciiCapable,EmojiCapable"

            android:isAsciiCapable="true"

    />

    -->

    <subtype android:icon="@drawable/ic_ime_switcher_dark"

            android:label="@string/subtype_generic"

            android:subtypeId="0x93972eee"

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

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import java.util.ArrayList; 


@SmallTest

public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {

    private static final int NUMBER_OF_SUBTYPES = 78;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 47;

    private static final int NUMBER_OF_SUBTYPES = 85;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 50;

    private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.inputmethod.keyboard.layout.tests;



import android.test.suitebuilder.annotation.Suppress;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.inputmethod.keyboard.layout.BengaliAkkhor;

import com.android.inputmethod.keyboard.layout.LayoutBase;
@@ -29,7 +29,7 @@ import java.util.Locale; 
/**

 * bn_BD: Bengali (Bangladesh)/bengali_akkhor

 */

@Suppress

@SmallTest

public final class TestsBengaliBD extends LayoutTestsBase {

    private static final Locale LOCALE = new Locale("bn", "BD");

    private static final LayoutBase LAYOUT = new BengaliAkkhor(new BengaliBDCustomzier(LOCALE));

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.inputmethod.keyboard.layout.tests;



import android.test.suitebuilder.annotation.Suppress;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.inputmethod.keyboard.layout.LayoutBase;

import com.android.inputmethod.keyboard.layout.Qwerty;
@@ -30,7 +30,7 @@ import java.util.Locale; 
/*

 * hi_ZZ: Hinglish/qwerty

 */

@Suppress

@SmallTest

public final class TestsHinglish extends LayoutTestsBase {

    private static final Locale LOCALE = new Locale("hi", "ZZ");

    private static final LayoutBase LAYOUT = new Qwerty(new HinglishCustomizer(LOCALE));

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.inputmethod.keyboard.layout.tests;



import android.test.suitebuilder.annotation.Suppress;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.inputmethod.keyboard.layout.LayoutBase;

import com.android.inputmethod.keyboard.layout.Myanmar;
@@ -26,7 +26,7 @@ import java.util.Locale; 
/**

 * my_MM: Myanmar (Myanmar)/myanmar

 */

@Suppress

@SmallTest

public final class TestsMyanmarMM extends LayoutTestsBase {

    private static final Locale LOCALE = new Locale("my", "MM");

    private static final LayoutBase LAYOUT = new Myanmar(LOCALE);