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

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

Fix build 

Related-change: I173a3dc0
Change-Id: I4b5adedb70f7501e84fd3604aa240161c97dc713
parent 8e50c5d1

java/src/com/android/inputmethod/latin/AdditionalSubtype.java

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ public class AdditionalSubtype { 
            String localeString, String keyboardLayoutSetName, String extraValue) {

        final String layoutExtraValue = KEYBOARD_LAYOUT_SET + "=" + keyboardLayoutSetName;

        final String layoutDisplayNameExtraValue;

        if (SubtypeLocale.isExceptionalLocale(localeString)

                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {

        if (Build.VERSION.SDK_INT >= /* JELLY_BEAN */ 15

                && SubtypeLocale.isExceptionalLocale(localeString)) {

            final String layoutDisplayName = SubtypeLocale.getKeyboardLayoutSetDisplayName(

                    keyboardLayoutSetName);

            layoutDisplayNameExtraValue = StringUtils.appendToCsvIfNotExists(

java/src/com/android/inputmethod/latin/SubtypeLocale.java

+3 −4
Original line number Diff line number Diff line
@@ -112,8 +112,7 @@ public class SubtypeLocale { 
    }



    public static int getSubtypeNameId(String localeString, String keyboardLayoutName) {

        if (isExceptionalLocale(localeString)

                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {

        if (Build.VERSION.SDK_INT >= /* JELLY_BEAN */ 15 && isExceptionalLocale(localeString)) {

            return sExceptionalLocaleToWithLayoutNameIdsMap.get(localeString);

        }

        final String key = localeString.equals(NO_LANGUAGE)
@@ -148,8 +147,8 @@ public class SubtypeLocale { 
    //  zz    azerty T  No language (AZERTY)    in system locale



    public static String getSubtypeDisplayName(final InputMethodSubtype subtype, Resources res) {

        final String replacementString =

                subtype.containsExtraValueKey(UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME)

        final String replacementString = (Build.VERSION.SDK_INT >= /* JELLY_BEAN */ 15

                && subtype.containsExtraValueKey(UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME))

                ? subtype.getExtraValueOf(UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME)

                : getSubtypeLocaleDisplayName(subtype.getLocale());

        final int nameResId = subtype.getNameResId();