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

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

(DO NOT MERGE) Disable Sinhala keyboard for L-release 

This CL also disables Tamil (Sri Lanka) subtype in conjunction with
Sinhala (Sri Lanka) subtype.

Bug: 6911143
Bug: 9978106
Change-Id: I686b4e5d2c79039ca8d837d3227448d69c7e47de
parent 25906373

java/res/xml/method.xml

+9 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
    pt_PT: Portuguese (Portugal)/qwerty

    ro: Romanian/qwerty

    ru: Russian/east_slavic

    si_LK: Sinhala (Sri Lanka)/sinhala

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

    sk: Slovak/qwerty

    sl: Slovenian/qwerty

    sr: Serbian/south_slavic
@@ -92,7 +92,7 @@ 
    sv: Swedish/nordic

    sw: Swahili/qwerty

    ta_IN: Tamil (India)/tamil

    ta_LK: Tamil (Sri Lanka)/tamil

    (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
@@ -616,6 +616,9 @@ 
            android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"

            android:isAsciiCapable="false"

    />

    <!-- 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"
@@ -624,6 +627,7 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=sinhala,EmojiCapable"

            android:isAsciiCapable="false"

    />

    -->

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

            android:label="@string/subtype_generic"

            android:subtypeId="0x8e94d413"
@@ -690,6 +694,8 @@ 
            android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"

            android:isAsciiCapable="false"

    />

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

    <!--

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

            android:label="@string/subtype_generic"

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

            android:isAsciiCapable="false"

    />

    -->

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

            android:label="@string/subtype_generic"

            android:subtypeId="0x785abbd9"

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

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


@SmallTest

public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {

    private static final int NUMBER_OF_SUBTYPES = 78;

    private static final int NUMBER_OF_SUBTYPES = 76;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 45;

    private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.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.SmallTest;

import android.test.suitebuilder.annotation.Suppress;



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

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

 * si_LK: Sinhala (Sri Lanka)/sinhala

 */

@SmallTest

@Suppress

public final class TestsSinhalaLK extends LayoutTestsBase {

    private static final Locale LOCALE = new Locale("si", "LK");

    private static final LayoutBase LAYOUT = new Sinhala(new SinhalaCustomizer(LOCALE));

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.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.SmallTest;

import android.test.suitebuilder.annotation.Suppress;



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

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

 * ta_LK: Tamil (Sri Lanka)/tamil

 */

@SmallTest

@Suppress

public final class TestsTamilLK extends LayoutTestsBase {

    private static final Locale LOCALE = new Locale("ta", "LK");

    private static final LayoutBase LAYOUT = new Tamil(new TamilLKCustomizer(LOCALE));