diff options
| author | Kaikai Wang <kaikai@google.com> | 2014-09-19 16:39:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-19 16:39:00 +0000 |
| commit | b2f2f59143a46f6b0c526cde9ba7129a80c569ea (patch) | |
| tree | 3bf741a009bdbc8f1bde20fbfadf90ecb1855f64 | |
| parent | b0567d4a8ae688ca05bf5f335f3200431108543e (diff) | |
| parent | fe686ee34d9d881a13a5f958583abeb66ba4c47c (diff) | |
| download | android_frameworks_opt_chips-b2f2f59143a46f6b0c526cde9ba7129a80c569ea.tar.gz android_frameworks_opt_chips-b2f2f59143a46f6b0c526cde9ba7129a80c569ea.tar.bz2 android_frameworks_opt_chips-b2f2f59143a46f6b0c526cde9ba7129a80c569ea.zip | |
am fe686ee3: Merge "Bug: 17517371: Stop using custom action label in chips" into ub-chips-cranbrook
* commit 'fe686ee34d9d881a13a5f958583abeb66ba4c47c':
Bug: 17517371: Stop using custom action label in chips
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/com/android/ex/chips/RecipientEditTextView.java | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libchips LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ $(call all-logtags-files-under, src) diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java index cca6b52..f13b0d0 100644 --- a/src/com/android/ex/chips/RecipientEditTextView.java +++ b/src/com/android/ex/chips/RecipientEditTextView.java @@ -366,7 +366,11 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements } outAttrs.actionId = EditorInfo.IME_ACTION_DONE; - outAttrs.actionLabel = getContext().getString(R.string.action_label); + + // Custom action labels are discouraged in L; a checkmark icon is shown in place of the + // custom text in this case. + outAttrs.actionLabel = Build.VERSION.SDK_INT >= Build.VERSION_CODES.L ? null : + getContext().getString(R.string.action_label); return connection; } |