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

Commit e78ca947 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 47c9c32c: Merge "Enable preliminary Sinhara keyboard for dogfood" 

* commit '47c9c32c':
  Enable preliminary Sinhara keyboard for dogfood
parents c92a25c3 47c9c32c

java/res/xml/method.xml

+1 −5
Original line number Original line Diff line number Diff line
@@ -639,7 +639,6 @@ 
    />

    />

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

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

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

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

    <!--

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

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

            android:label="@string/subtype_generic"

            android:label="@string/subtype_generic"

            android:subtypeId="0x5c6b3bde"

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

            android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable"

            android:isAsciiCapable="false"

            android:isAsciiCapable="false"

    />

    />

    -->

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

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

            android:label="@string/subtype_generic"

            android:label="@string/subtype_generic"

            android:subtypeId="0x8e94d413"

            android:subtypeId="0x8e94d413"
@@ -707,8 +705,7 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"

            android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"

            android:isAsciiCapable="false"

            android:isAsciiCapable="false"

    />

    />

    <!-- TODO: Enable ta_LK subtype when si_LK subtype is ready -->

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

    <!--

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

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

            android:label="@string/subtype_generic"

            android:label="@string/subtype_generic"

            android:subtypeId="0x6ca12d84"

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

            android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"

            android:isAsciiCapable="false"

            android:isAsciiCapable="false"

    />

    />

    -->

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

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

            android:label="@string/subtype_generic"

            android:label="@string/subtype_generic"

            android:subtypeId="0x785abbd9"

            android:subtypeId="0x785abbd9"

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ import java.util.ArrayList; 




@SmallTest

@SmallTest

public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {

public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {

    private static final int NUMBER_OF_SUBTYPES = 83;

    private static final int NUMBER_OF_SUBTYPES = 85;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 50;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 50;

    private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;

    private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;