diff options
| author |   satok <satok@google.com> | 2011-06-27 20:35:06 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-06-27 20:35:06 +0900 |
| commit | 387293ddf57089992b0535b7ac8a76b5ed7eb315 (patch) | |
| tree | 0f29a04e97c860cb268b94bb0b632675a53e20b8 /java/src | |
| parent | a12292f053470072cb4bfac2b2ff8fc5a2db0a5d (diff) | |
| parent | 281e180c33b1dd88e8eae48f279736c529f529d2 (diff) | |
| download | latinime-387293ddf57089992b0535b7ac8a76b5ed7eb315.tar.gz latinime-387293ddf57089992b0535b7ac8a76b5ed7eb315.tar.xz latinime-387293ddf57089992b0535b7ac8a76b5ed7eb315.zip | |
Merge remote-tracking branch 'goog/master' into merge
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 52935ef7d..3b840c8a1 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -514,7 +514,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar super.setInputView(view); mCandidateViewContainer = view.findViewById(R.id.candidates_container); mCandidateView = (CandidateView) view.findViewById(R.id.candidates); - mCandidateView.setListener(this, view); + if (mCandidateView != null) + mCandidateView.setListener(this, view); mCandidateStripHeight = (int)mResources.getDimension(R.dimen.candidate_strip_height); } |