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

am 93e2d777: Merge "Fix froyo-ub-LatinImeGoogle compatibility" into honeycomb 

* commit '93e2d777418d5a4e547e60a379d8deb5658692ab':
  Fix froyo-ub-LatinImeGoogle compatibility
main
Tadashi G. Takaoka 2011-01-14 07:00:59 -08:00 committed by Android Git Automerger
parent cb547f6ddb 93e2d77741
commit 0b971df9e3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java
View File

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

2
java/src/com/android/inputmethod/latin/Settings.java
View File

@ -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";