diff options
| -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 6306498..f1a2c00 100644 --- a/src/com/android/ex/chips/RecipientEditTextView.java +++ b/src/com/android/ex/chips/RecipientEditTextView.java @@ -367,7 +367,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; } |