Merge "Disable the legacy recorrection functionalities if the suggestion span is supported"
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 346af3a..d625951 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -482,12 +482,16 @@
 
     @Override
     public View onCreateInputView() {
-        final View inputView = mKeyboardSwitcher.onCreateInputView();
-        mCandidateViewContainer = inputView.findViewById(R.id.candidates_container);
-        mCandidateView = (CandidateView) inputView.findViewById(R.id.candidates);
+        return mKeyboardSwitcher.onCreateInputView();
+    }
+
+    @Override
+    public void setInputView(View view) {
+        super.setInputView(view);
+        mCandidateViewContainer = view.findViewById(R.id.candidates_container);
+        mCandidateView = (CandidateView) view.findViewById(R.id.candidates);
         mCandidateView.setService(this);
         mCandidateStripHeight = (int)mResources.getDimension(R.dimen.candidate_strip_height);
-        return inputView;
     }
 
     @Override