diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-01-14 07:03:02 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-01-14 07:03:02 -0800 |
| commit | 60166feb29f58b056361f52b9b93239a47cbde55 (patch) | |
| tree | c8fe92bfce42e9e81b7a01a9847713eb4cec4a04 /java/src | |
| parent | fcfe64f4ed0c11f364f511ed7239e3f6fd05c393 (diff) | |
| parent | 0b971df9e3793a5ae1bc24368b38a105c3015f11 (diff) | |
| download | latinime-60166feb29f58b056361f52b9b93239a47cbde55.tar.gz latinime-60166feb29f58b056361f52b9b93239a47cbde55.tar.xz latinime-60166feb29f58b056361f52b9b93239a47cbde55.zip | |
am 0b971df9: am 93e2d777: Merge "Fix froyo-ub-LatinImeGoogle compatibility" into honeycomb
* commit '0b971df9e3793a5ae1bc24368b38a105c3015f11':
Fix froyo-ub-LatinImeGoogle compatibility
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java index 458a9eed4..c150baadb 100644 --- a/java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java +++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java @@ -71,7 +71,7 @@ public class MiniKeyboardBuilder { for (CharSequence popupSpec : popupCharacters) { final CharSequence label = PopupCharactersParser.getLabel(popupSpec.toString()); // If the label is single letter, minKeyWidth is enough to hold the label. - if (label.length() > 1) { + if (label != null && label.length() > 1) { if (paint == null) { paint = new Paint(); paint.setAntiAlias(true); diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 8efeeda35..064a80fe1 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -182,7 +182,7 @@ public class Settings extends PreferenceActivity if (pref == mInputLanguageSelection) { final String action; if (android.os.Build.VERSION.SDK_INT - >= /* android.os.Build.VERSION_CODES.HONEYCOMB */ 10) { + >= /* android.os.Build.VERSION_CODES.HONEYCOMB */ 11) { action = "android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER"; } else { action = "com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"; |