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

Fix NPE in LatinKeyboard

Browse source 
Bug: 4727778
Change-Id: I9d5b7185d75408a8af6d302fb348e118c0f9721e
This commit is contained in:
Tadashi G. Takaoka 2011-06-21 10:06:45 +09:00
parent cdc12db404
commit 05c0fc6136
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
View file

@ -136,12 +136,16 @@ public class LatinKeyboard extends Keyboard {
// The threshold is "key width" x 1.25 // The threshold is "key width" x 1.25
mSpacebarLanguageSwitchThreshold = (getMostCommonKeyWidth() * 5) / 4; mSpacebarLanguageSwitchThreshold = (getMostCommonKeyWidth() * 5) / 4;
final int spaceKeyWidth = Math.max(mSpaceKey.mWidth, if (mSpaceKey != null) {
(int)(getMinWidth() * SPACEBAR_POPUP_MIN_RATIO)); final int slidingIconWidth = Math.max(mSpaceKey.mWidth,
final int spaceKeyheight = mSpacePreviewIcon.getIntrinsicHeight(); (int)(getMinWidth() * SPACEBAR_POPUP_MIN_RATIO));
mSlidingLocaleIcon = new SlidingLocaleDrawable( final int spaceKeyheight = mSpacePreviewIcon.getIntrinsicHeight();
context, mSpacePreviewIcon, spaceKeyWidth, spaceKeyheight); mSlidingLocaleIcon = new SlidingLocaleDrawable(
mSlidingLocaleIcon.setBounds(0, 0, spaceKeyWidth, spaceKeyheight); context, mSpacePreviewIcon, slidingIconWidth, spaceKeyheight);
mSlidingLocaleIcon.setBounds(0, 0, slidingIconWidth, spaceKeyheight);
} else {
mSlidingLocaleIcon = null;
}
} }
public void setSpacebarTextFadeFactor(float fadeFactor, LatinKeyboardView view) { public void setSpacebarTextFadeFactor(float fadeFactor, LatinKeyboardView view) {
@ -350,6 +354,8 @@ public class LatinKeyboard extends Keyboard {
if (mSpacebarSlidingLanguageSwitchDiff == diff) if (mSpacebarSlidingLanguageSwitchDiff == diff)
return; return;
mSpacebarSlidingLanguageSwitchDiff = diff; mSpacebarSlidingLanguageSwitchDiff = diff;
if (mSlidingLocaleIcon == null)
return;
mSlidingLocaleIcon.setDiff(diff); mSlidingLocaleIcon.setDiff(diff);
if (Math.abs(diff) == Integer.MAX_VALUE) { if (Math.abs(diff) == Integer.MAX_VALUE) {
mSpaceKey.setPreviewIcon(mSpacePreviewIcon); mSpaceKey.setPreviewIcon(mSpacePreviewIcon);