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

Fix NPE in LatinKeyboard when it represent phone keyboard

Browse source 
Bug: 3041532
Change-Id: I1d846e9175bd033f056a8715287a936be2fe8f74
This commit is contained in:
Tadashi G. Takaoka 2010-09-28 09:45:45 +09:00
parent 1571a660d8
commit 8bfcac4d84
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
java/src/com/android/inputmethod/latin/LatinKeyboard.java
View file

@ -158,9 +158,22 @@ public class LatinKeyboard extends Keyboard {
mNumberHintIcons[9] = res.getDrawable(R.drawable.keyboard_hint_9); mNumberHintIcons[9] = res.getDrawable(R.drawable.keyboard_hint_9);
} }
// TODO: delete this method and do initialization in constructor.
private void initializeMemberVariablesAsNeeded() {
if (mNumberHintKeys == null)
mNumberHintKeys = new Key[NUMBER_HINT_COUNT];
if (mShiftKeys == null)
mShiftKeys = new ArrayList<Key>();
}
@Override @Override
protected Key createKeyFromXml(Resources res, Row parent, int x, int y, protected Key createKeyFromXml(Resources res, Row parent, int x, int y,
XmlResourceParser parser) { XmlResourceParser parser) {
// TODO: This initialization is needed because this protected method is being called from
// the base class constructor before this class constructor gets called. We need to fix
// this.
initializeMemberVariablesAsNeeded();
Key key = new LatinKey(res, parent, x, y, parser); Key key = new LatinKey(res, parent, x, y, parser);
switch (key.codes[0]) { switch (key.codes[0]) {
case LatinIME.KEYCODE_ENTER: case LatinIME.KEYCODE_ENTER:
@ -173,10 +186,6 @@ public class LatinKeyboard extends Keyboard {
mSpaceKey = key; mSpaceKey = key;
break; break;
case KEYCODE_SHIFT: case KEYCODE_SHIFT:
// NOTE: This protected method is being called from the base class constructor before
// mShiftKeys gets initialized.
if (mShiftKeys == null)
mShiftKeys = new ArrayList<Key>();
mShiftKeys.add(key); mShiftKeys.add(key);
break; break;
case KEYCODE_MODE_CHANGE: case KEYCODE_MODE_CHANGE:
@ -186,11 +195,6 @@ public class LatinKeyboard extends Keyboard {
} }
// For number hints on the upper-right corner of key // For number hints on the upper-right corner of key
if (mNumberHintKeys == null) {
// NOTE: This protected method is being called from the base class constructor before
// mNumberHintKeys gets initialized.
mNumberHintKeys = new Key[NUMBER_HINT_COUNT];
}
int hintNumber = -1; int hintNumber = -1;
if (LatinKeyboardBaseView.isNumberAtLeftmostPopupChar(key)) { if (LatinKeyboardBaseView.isNumberAtLeftmostPopupChar(key)) {
hintNumber = key.popupCharacters.charAt(0) - '0'; hintNumber = key.popupCharacters.charAt(0) - '0';