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

am 165725ab: Fix build

Browse source 
* commit '165725aba8a179440af9c93869b35f206b2e133f':
  Fix build
This commit is contained in:
Tadashi G. Takaoka 2012-05-06 16:53:43 -07:00 committed by Android Git Automerger
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) { String localeString, String keyboardLayoutSetName, String extraValue) {
final String layoutExtraValue = KEYBOARD_LAYOUT_SET + "=" + keyboardLayoutSetName; final String layoutExtraValue = KEYBOARD_LAYOUT_SET + "=" + keyboardLayoutSetName;
final String layoutDisplayNameExtraValue; final String layoutDisplayNameExtraValue;
if (SubtypeLocale.isExceptionalLocale(localeString) if (Build.VERSION.SDK_INT >= /* JELLY_BEAN */ 15
&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { && SubtypeLocale.isExceptionalLocale(localeString)) {
final String layoutDisplayName = SubtypeLocale.getKeyboardLayoutSetDisplayName( final String layoutDisplayName = SubtypeLocale.getKeyboardLayoutSetDisplayName(
keyboardLayoutSetName); keyboardLayoutSetName);
layoutDisplayNameExtraValue = StringUtils.appendToCsvIfNotExists( 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) { public static int getSubtypeNameId(String localeString, String keyboardLayoutName) {
if (isExceptionalLocale(localeString) if (Build.VERSION.SDK_INT >= /* JELLY_BEAN */ 15 && isExceptionalLocale(localeString)) {
&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
return sExceptionalLocaleToWithLayoutNameIdsMap.get(localeString); return sExceptionalLocaleToWithLayoutNameIdsMap.get(localeString);
} }
final String key = localeString.equals(NO_LANGUAGE) final String key = localeString.equals(NO_LANGUAGE)
@ -148,8 +147,8 @@ public class SubtypeLocale {
// zz azerty T No language (AZERTY) in system locale // zz azerty T No language (AZERTY) in system locale
public static String getSubtypeDisplayName(final InputMethodSubtype subtype, Resources res) { public static String getSubtypeDisplayName(final InputMethodSubtype subtype, Resources res) {
final String replacementString = final String replacementString = (Build.VERSION.SDK_INT >= /* JELLY_BEAN */ 15
subtype.containsExtraValueKey(UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME) && subtype.containsExtraValueKey(UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME))
? subtype.getExtraValueOf(UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME) ? subtype.getExtraValueOf(UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME)
: getSubtypeLocaleDisplayName(subtype.getLocale()); : getSubtypeLocaleDisplayName(subtype.getLocale());
final int nameResId = subtype.getNameResId(); final int nameResId = subtype.getNameResId();