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

am 5dc318a3: am 10dff768: Fix NPE introduced by I38b21d49 

* commit '5dc318a3f20bc2e176fb2627f606f3861adf849e':
  Fix NPE introduced by I38b21d49
main
Tadashi G. Takaoka 2011-11-18 14:52:35 -08:00 committed by Android Git Automerger
parent 312ef1ee75 5dc318a3f2
commit 0c0beffba0
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

@ -255,18 +255,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 =
@ -507,6 +509,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();