diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-07 08:16:50 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-05-07 08:19:17 +0900 |
| commit | 165725aba8a179440af9c93869b35f206b2e133f (patch) | |
| tree | 0418c4e8541c4b9bc26749ac3c229d15e964f311 /java/src | |
| parent | 8e50c5d198f65beb6679a9a1e0102e5fc52d7707 (diff) | |
| download | latinime-165725aba8a179440af9c93869b35f206b2e133f.tar.gz latinime-165725aba8a179440af9c93869b35f206b2e133f.tar.xz latinime-165725aba8a179440af9c93869b35f206b2e133f.zip | |
Fix build
Related-change: I173a3dc0
Change-Id: I4b5adedb70f7501e84fd3604aa240161c97dc713
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/AdditionalSubtype.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeLocale.java | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/AdditionalSubtype.java b/java/src/com/android/inputmethod/latin/AdditionalSubtype.java index a6e7a82f1..f0076a5b6 100644 --- a/java/src/com/android/inputmethod/latin/AdditionalSubtype.java +++ b/java/src/com/android/inputmethod/latin/AdditionalSubtype.java @@ -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( diff --git a/java/src/com/android/inputmethod/latin/SubtypeLocale.java b/java/src/com/android/inputmethod/latin/SubtypeLocale.java index 354a0c8df..ca293060a 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeLocale.java +++ b/java/src/com/android/inputmethod/latin/SubtypeLocale.java @@ -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(); |