Merge remote-tracking branch 'goog/master' into merge

This commit is contained in:
satok 2011-06-27 20:35:06 +09:00
commit 387293ddf5

View file

@ -514,7 +514,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
super.setInputView(view); super.setInputView(view);
mCandidateViewContainer = view.findViewById(R.id.candidates_container); mCandidateViewContainer = view.findViewById(R.id.candidates_container);
mCandidateView = (CandidateView) view.findViewById(R.id.candidates); 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); mCandidateStripHeight = (int)mResources.getDimension(R.dimen.candidate_strip_height);
} }