diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-08-06 22:10:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-04 23:48:34 +0000 |
| commit | 142f4c5623ade2c55d2a8de7e6a5fedf17bccc96 (patch) | |
| tree | b2f306a0f834a89fbec9d1d54e4fae27545479af | |
| parent | b58c9a621a250c6119be2d5a77164b940a8559b0 (diff) | |
| parent | f585f36afd00a3591dc71ce6acef00dd718c6287 (diff) | |
| download | android_frameworks_opt_chips-142f4c5623ade2c55d2a8de7e6a5fedf17bccc96.tar.gz android_frameworks_opt_chips-142f4c5623ade2c55d2a8de7e6a5fedf17bccc96.tar.bz2 android_frameworks_opt_chips-142f4c5623ade2c55d2a8de7e6a5fedf17bccc96.zip | |
Merge "Don't use "done" for string name." into ub-chips-cranbrook
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/ex/chips/RecipientEditTextView.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 3588ec3..d1c9c7f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -25,5 +25,5 @@ <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> + <string name="action_label">Return</string> </resources> diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java index 9fd13d6..713fe87 100644 --- a/src/com/android/ex/chips/RecipientEditTextView.java +++ b/src/com/android/ex/chips/RecipientEditTextView.java @@ -400,7 +400,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements } outAttrs.actionId = EditorInfo.IME_ACTION_DONE; - outAttrs.actionLabel = getContext().getString(R.string.done); + outAttrs.actionLabel = getContext().getString(R.string.action_label); return connection; } |