diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 3 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/CandidateView.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 2512118d4..7c68c93f2 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -745,8 +745,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha } } - mKeyboardView = (LatinKeyboardView) mCurrentInputView.findViewById( - R.id.latin_keyboard_view); + mKeyboardView = (LatinKeyboardView) mCurrentInputView.findViewById(R.id.keyboard_view); mKeyboardView.setOnKeyboardActionListener(mInputMethodService); mThemeIndex = themeIndex; return mCurrentInputView; diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java index a8381020f..b4f6b2c91 100644 --- a/java/src/com/android/inputmethod/latin/CandidateView.java +++ b/java/src/com/android/inputmethod/latin/CandidateView.java @@ -156,7 +156,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo tv.setOnLongClickListener(this); mWords.add(tv); if (i > 0) { - View divider = inflater.inflate(R.layout.candidate_divider, null); + final View divider = inflater.inflate(R.layout.candidate_divider, null); mDividers.add(divider); } } @@ -198,7 +198,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo final int color; if (isAutoCorrect && mConfigCandidateHighlightFontColorEnabled) { color = mColorAutoCorrect; - } else if (isSuggestedCandidate) { + } else if (isSuggestedCandidate && mConfigCandidateHighlightFontColorEnabled) { color = mColorSuggestedCandidate; } else { color = mColorTypedWord; |