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

am 10dff768: Fix NPE introduced by I38b21d49

Browse source 
* commit '10dff76856a98b6eec86a53d3d07fdc9708037b7':
  Fix NPE introduced by I38b21d49
This commit is contained in:
Tadashi G. Takaoka 2011-11-17 22:48:03 -08:00 committed by Android Git Automerger
commit a305cd62dd
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -245,18 +245,20 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
private static final int MSG_SET_BIGRAM_PREDICTIONS = 7; private static final int MSG_SET_BIGRAM_PREDICTIONS = 7;
private static final int MSG_PENDING_IMS_CALLBACK = 8; private static final int MSG_PENDING_IMS_CALLBACK = 8;
private final int mDelayBeforeFadeoutLanguageOnSpacebar; private int mDelayBeforeFadeoutLanguageOnSpacebar;
private final int mDelayUpdateSuggestions; private int mDelayUpdateSuggestions;
private final int mDelayUpdateShiftState; private int mDelayUpdateShiftState;
private final int mDurationOfFadeoutLanguageOnSpacebar; private int mDurationOfFadeoutLanguageOnSpacebar;
private final float mFinalFadeoutFactorOfLanguageOnSpacebar; private float mFinalFadeoutFactorOfLanguageOnSpacebar;
private final long mDoubleSpacesTurnIntoPeriodTimeout; private long mDoubleSpacesTurnIntoPeriodTimeout;
private final long mIgnoreSpecialKeyTimeout; private long mIgnoreSpecialKeyTimeout;
public UIHandler(LatinIME outerInstance) { public UIHandler(LatinIME outerInstance) {
super(outerInstance); super(outerInstance);
}
final Resources res = outerInstance.getResources(); public void onCreate() {
final Resources res = getOuterInstance().getResources();
mDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger( mDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger(
R.integer.config_delay_before_fadeout_language_on_spacebar); R.integer.config_delay_before_fadeout_language_on_spacebar);
mDelayUpdateSuggestions = mDelayUpdateSuggestions =
@ -497,6 +499,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
mSubtypeSwitcher = SubtypeSwitcher.getInstance(); mSubtypeSwitcher = SubtypeSwitcher.getInstance();
mKeyboardSwitcher = KeyboardSwitcher.getInstance(); mKeyboardSwitcher = KeyboardSwitcher.getInstance();
mVibrator = VibratorCompatWrapper.getInstance(this); mVibrator = VibratorCompatWrapper.getInstance(this);
mHandler.onCreate();
DEBUG = LatinImeLogger.sDBG; DEBUG = LatinImeLogger.sDBG;
final Resources res = getResources(); final Resources res = getResources();