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

Merge "Fix NPE"

main
Tadashi G. Takaoka 2011-06-18 07:49:44 -07:00 committed by Android (Google) Code Review
parent ada37cb4d3 5e4e05afd2
commit 76427c8e56
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -782,11 +782,15 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
} }
public void onAutoCorrectionStateChanged(boolean isAutoCorrection) { public void onAutoCorrectionStateChanged(boolean isAutoCorrection) {
if (isAutoCorrection != mIsAutoCorrectionActive) { if (mIsAutoCorrectionActive != isAutoCorrection) {
LatinKeyboardView keyboardView = getKeyboardView();
mIsAutoCorrectionActive = isAutoCorrection; mIsAutoCorrectionActive = isAutoCorrection;
keyboardView.invalidateKey(((LatinKeyboard) keyboardView.getKeyboard()) final LatinKeyboard keyboard = getLatinKeyboard();
.onAutoCorrectionStateChanged(isAutoCorrection)); if (keyboard != null && keyboard.needsAutoCorrectionSpacebarLed()) {
final Key invalidatedKey = keyboard.onAutoCorrectionStateChanged(isAutoCorrection);
final LatinKeyboardView keyboardView = getKeyboardView();
if (keyboardView != null)
keyboardView.invalidateKey(invalidatedKey);
}
} }
} }

6
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1459,18 +1459,12 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
public void setSuggestions(SuggestedWords words) { public void setSuggestions(SuggestedWords words) {
// if (mVoiceProxy.getAndResetIsShowingHint()) {
// setCandidatesView(mCandidateViewContainer);
// }
if (mCandidateView != null) { if (mCandidateView != null) {
mCandidateView.setSuggestions(words); mCandidateView.setSuggestions(words);
if (mKeyboardSwitcher.getLatinKeyboard().needsAutoCorrectionSpacebarLed()) {
mKeyboardSwitcher.onAutoCorrectionStateChanged( mKeyboardSwitcher.onAutoCorrectionStateChanged(
words.hasWordAboveAutoCorrectionScoreThreshold()); words.hasWordAboveAutoCorrectionScoreThreshold());
} }
} }
}
public void updateSuggestions() { public void updateSuggestions() {
// Check if we have a suggestion engine attached. // Check if we have a suggestion engine attached.