Merge "Calculate text width more conservatively"
diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index 5763610..0ff5d9e 100644
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -371,6 +371,7 @@
if (suggestions == null)
return;
mSuggestions = suggestions;
+ mExpandCandidatesPane.setEnabled(false);
if (mShowingAutoCorrectionInverted) {
mHandler.postUpdateSuggestions();
} else {
@@ -428,6 +429,7 @@
} else {
mCandidatesPaneControl.setVisibility(VISIBLE);
mExpandCandidatesPane.setVisibility(VISIBLE);
+ mExpandCandidatesPane.setEnabled(true);
}
final int countInStrip = params.mCountInStrip;