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

Commit 37cb7a73 authored by Chieu Nguyen's avatar Chieu Nguyen Committed by Android (Google) Code Review
Browse files

Merge "Disable Hinglish locale."

parents f74005d8 67bb8cbe

java/res/xml/method.xml

+2 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ 
    />

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

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

    <!--  Disabled because there is no LM yet, and this layout does not offer anything different.

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

            android:label="@string/subtype_hi_ZZ"

            android:subtypeId="0x352eb37c"
@@ -374,6 +375,7 @@ 
            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"

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 = 82;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 50;

    private static final int NUMBER_OF_SUBTYPES = 81;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 49;

    private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;



    @Override

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.SmallTest;

import android.test.suitebuilder.annotation.Suppress;



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

 */

@SmallTest

@Suppress

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));