am c2f93e80: am 99567d89: am feddb49c: Merge "Fix shortcut action text length issues." into mnc-dev
* commit 'c2f93e80fd358b274795b79e482c63d12044da00':
Fix shortcut action text length issues.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 21cd890..213d340 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -495,17 +495,17 @@
</string>
<!-- Shortcut item used to add a number directly to a new contact from search.
- [CHAR LIMIT=40] -->
+ [CHAR LIMIT=25] -->
<string name="search_shortcut_create_new_contact">Create new contact</string>
<!-- Shortcut item used to add a number to an existing contact directly from search.
- [CHAR LIMIT=40] -->
- <string name="search_shortcut_add_to_existing_contact">Add to existing contact</string>
+ [CHAR LIMIT=25] -->
+ <string name="search_shortcut_add_to_contact">Add to contact</string>
- <!-- Shortcut item used to send a text message directly from search. [CHAR LIMIT=40] -->
+ <!-- Shortcut item used to send a text message directly from search. [CHAR LIMIT=25] -->
<string name="search_shortcut_send_sms_message">Send SMS</string>
- <!-- Shortcut item used to make a video call directly from search. -->
+ <!-- Shortcut item used to make a video call directly from search. [CHAR LIMIT=25] -->
<string name="search_shortcut_make_video_call">Make video call</string>
<!-- Title for the call log list item that brings users to the full call history when clicked -->
diff --git a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
index 82daab5..8a43023 100644
--- a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
+++ b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
@@ -149,7 +149,7 @@
drawableId = R.drawable.ic_search_add_contact;
break;
case SHORTCUT_ADD_TO_EXISTING_CONTACT:
- text = resources.getString(R.string.search_shortcut_add_to_existing_contact);
+ text = resources.getString(R.string.search_shortcut_add_to_contact);
drawableId = R.drawable.ic_person_24dp;
break;
case SHORTCUT_SEND_SMS_MESSAGE: