Fix froyo-ub-LatinImeGoogle compatibility
Change-Id: I46fca4735d08552dfb414b2b302b4ed97ae96ab0main
parent
297d6619b3
commit
34cee317d8
|
@ -71,7 +71,7 @@ public class MiniKeyboardBuilder {
|
||||||
for (CharSequence popupSpec : popupCharacters) {
|
for (CharSequence popupSpec : popupCharacters) {
|
||||||
final CharSequence label = PopupCharactersParser.getLabel(popupSpec.toString());
|
final CharSequence label = PopupCharactersParser.getLabel(popupSpec.toString());
|
||||||
// If the label is single letter, minKeyWidth is enough to hold the label.
|
// 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) {
|
if (paint == null) {
|
||||||
paint = new Paint();
|
paint = new Paint();
|
||||||
paint.setAntiAlias(true);
|
paint.setAntiAlias(true);
|
||||||
|
|
|
@ -182,7 +182,7 @@ public class Settings extends PreferenceActivity
|
||||||
if (pref == mInputLanguageSelection) {
|
if (pref == mInputLanguageSelection) {
|
||||||
final String action;
|
final String action;
|
||||||
if (android.os.Build.VERSION.SDK_INT
|
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";
|
action = "android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER";
|
||||||
} else {
|
} else {
|
||||||
action = "com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION";
|
action = "com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION";
|
||||||
|
|
Loading…
Reference in New Issue