commit d4d98e3e3db67e53b16e2b7bafd90aa58eec66f7
author Jean Chalard <jchalard@google.com> Fri Jun 14 08:59:23 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 14 08:59:23 2013 +0000
tree c033f6868df31967b50be353e0fdd41c982f04ab
parent 8c2f42e7dd5eb1d5d233b3f09001ffd56986a3ab
parent 8385f1c622e20489d665a3d083b4dd8243f46c64

Merge "Fix a bug where a user dict entry is too long"

src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java

diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
index 3251216..5efe117 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -64,7 +64,9 @@
         final String word = args.getString(EXTRA_WORD);
         if (null != word) {
             mWordEditText.setText(word);
-            mWordEditText.setSelection(word.length());
+            // Use getText in case the edit text modified the text we set. This happens when
+            // it's too long to be edited.
+            mWordEditText.setSelection(mWordEditText.getText().length());
         }
         final String shortcut = args.getString(EXTRA_SHORTCUT);
         if (null != shortcut && null != mShortcutEditText) {