diff options
| author | Mindy Pereira <mindyp@google.com> | 2012-05-09 11:38:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-09 11:38:04 -0700 |
| commit | f30ffd135bc6c2d6b4488267f623eae271f25807 (patch) | |
| tree | 280508b027b03d306f916b97fe290797667c8931 | |
| parent | 7e12aaa7748c44952d91b88c6f2863c16fe06deb (diff) | |
| parent | 1896ac000251e74f4939421d3d4d28b69717c52a (diff) | |
| download | android_frameworks_ex-f30ffd135bc6c2d6b4488267f623eae271f25807.tar.gz android_frameworks_ex-f30ffd135bc6c2d6b4488267f623eae271f25807.tar.bz2 android_frameworks_ex-f30ffd135bc6c2d6b4488267f623eae271f25807.zip | |
am 1896ac00: Change text on "done" to say "return"
* commit '1896ac000251e74f4939421d3d4d28b69717c52a':
Change text on "done" to say "return"
| -rw-r--r-- | chips/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | chips/src/com/android/ex/chips/RecipientEditTextView.java | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chips/res/values/strings.xml b/chips/res/values/strings.xml index 369a6cb..f67d440 100644 --- a/chips/res/values/strings.xml +++ b/chips/res/values/strings.xml @@ -26,4 +26,7 @@ <!-- Text displayed when the user long presses on a chip to copy the recipient's phone number. [CHAR LIMIT=200] --> <string name="copy_number">Copy phone number</string> + <!-- Text displayed in the enter key slot when the recipientedittextview has focus. + [CHAR LIMIT=12] --> + <string name="done">Return</string> </resources> diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java index 759c7ce..39a481b 100644 --- a/chips/src/com/android/ex/chips/RecipientEditTextView.java +++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java @@ -294,6 +294,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements if ((outAttrs.imeOptions&EditorInfo.IME_FLAG_NO_ENTER_ACTION) != 0) { outAttrs.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION; } + outAttrs.actionLabel = getContext().getString(R.string.done); return connection; } |