nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 165725ab: Fix build 

* commit '165725aba8a179440af9c93869b35f206b2e133f':
  Fix build
main
Tadashi G. Takaoka 2012-05-06 16:53:43 -07:00 committed by Android Git Automerger
parent 33e95e9186 165725aba8
commit 9fcae31e7e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/AdditionalSubtype.java
View File

@ -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(

7
java/src/com/android/inputmethod/latin/SubtypeLocale.java
View File

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