Skip to content
Snippets Groups Projects
Commit a66069ab authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix possible NPE in MainKeyboardView

Change-Id: I1fc21a981d9f1740315763b5ca0c1024ece1fa4d
parent a94733cb
No related branches found
No related tags found
No related merge requests found
...@@ -895,13 +895,16 @@ public final class MainKeyboardView extends KeyboardView implements DrawingProxy ...@@ -895,13 +895,16 @@ public final class MainKeyboardView extends KeyboardView implements DrawingProxy
} }
private void drawLanguageOnSpacebar(final Key key, final Canvas canvas, final Paint paint) { private void drawLanguageOnSpacebar(final Key key, final Canvas canvas, final Paint paint) {
final Keyboard keyboard = getKeyboard();
if (keyboard == null) {
return;
}
final int width = key.getWidth(); final int width = key.getWidth();
final int height = key.getHeight(); final int height = key.getHeight();
paint.setTextAlign(Align.CENTER); paint.setTextAlign(Align.CENTER);
paint.setTypeface(Typeface.DEFAULT); paint.setTypeface(Typeface.DEFAULT);
paint.setTextSize(mLanguageOnSpacebarTextSize); paint.setTextSize(mLanguageOnSpacebarTextSize);
final RichInputMethodSubtype subtype = getKeyboard().mId.mSubtype; final String language = layoutLanguageOnSpacebar(paint, keyboard.mId.mSubtype, width);
final String language = layoutLanguageOnSpacebar(paint, subtype, width);
// Draw language text with shadow // Draw language text with shadow
final float descent = paint.descent(); final float descent = paint.descent();
final float textHeight = -paint.ascent() + descent; final float textHeight = -paint.ascent() + descent;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment