diff options
5 files changed, 10 insertions, 12 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 2b100f6f8..07460ec4a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -502,8 +502,9 @@ <xliff:g id="number">%s</xliff:g> </string> - <!-- Shortcut item used to add a number directly from search --> - <string name="search_shortcut_add_to_contacts">Add to contacts</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> <!-- Shortcut item used to send a text message directly from search. [CHAR LIMIT=40] --> <string name="search_shortcut_send_sms_message">Send SMS</string> diff --git a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java index 86e852846..089937259 100644 --- a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java +++ b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java @@ -27,7 +27,7 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter { public final static int SHORTCUT_INVALID = -1; public final static int SHORTCUT_DIRECT_CALL = 0; - public final static int SHORTCUT_ADD_NUMBER_TO_CONTACTS = 1; + public final static int SHORTCUT_ADD_TO_EXISTING_CONTACT = 1; public final static int SHORTCUT_SEND_SMS_MESSAGE = 2; public final static int SHORTCUT_MAKE_VIDEO_CALL = 3; @@ -143,9 +143,9 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter { text = resources.getString(R.string.search_shortcut_call_number, number); drawableId = R.drawable.ic_search_phone; break; - case SHORTCUT_ADD_NUMBER_TO_CONTACTS: - text = resources.getString(R.string.search_shortcut_add_to_contacts); - drawableId = R.drawable.ic_search_add_contact; + case SHORTCUT_ADD_TO_EXISTING_CONTACT: + text = resources.getString(R.string.search_shortcut_add_to_existing_contact); + drawableId = R.drawable.ic_person_24dp; break; case SHORTCUT_SEND_SMS_MESSAGE: text = resources.getString(R.string.search_shortcut_send_sms_message); diff --git a/src/com/android/dialer/list/RegularSearchListAdapter.java b/src/com/android/dialer/list/RegularSearchListAdapter.java index 9d6694a7f..87d4fd2c8 100644 --- a/src/com/android/dialer/list/RegularSearchListAdapter.java +++ b/src/com/android/dialer/list/RegularSearchListAdapter.java @@ -69,10 +69,7 @@ public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter { final boolean showNumberShortcuts = !TextUtils.isEmpty(getFormattedQueryString()); boolean changed = false; changed |= setShortcutEnabled(SHORTCUT_DIRECT_CALL, showNumberShortcuts); - // Either one of the add contacts options should be enabled. If the user entered - // a dialable number, then clicking add to contact should add it as a number. - // Otherwise, it should add it to a new contact as a name. - changed |= setShortcutEnabled(SHORTCUT_ADD_NUMBER_TO_CONTACTS, showNumberShortcuts); + changed |= setShortcutEnabled(SHORTCUT_ADD_TO_EXISTING_CONTACT, showNumberShortcuts); changed |= setShortcutEnabled(SHORTCUT_MAKE_VIDEO_CALL, showNumberShortcuts && CallUtil.isVideoEnabled(getContext())); if (changed) { diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java index ba014380c..e60936234 100644 --- a/src/com/android/dialer/list/SearchFragment.java +++ b/src/com/android/dialer/list/SearchFragment.java @@ -163,7 +163,7 @@ public class SearchFragment extends PhoneNumberPickerFragment { listener.onCallNumberDirectly(getQueryString()); } break; - case DialerPhoneNumberListAdapter.SHORTCUT_ADD_NUMBER_TO_CONTACTS: + case DialerPhoneNumberListAdapter.SHORTCUT_ADD_TO_EXISTING_CONTACT: final String number = TextUtils.isEmpty(mAddToContactNumber) ? adapter.getFormattedQueryString() : mAddToContactNumber; final Intent intent = DialtactsActivity.getAddNumberToContactIntent(number); diff --git a/src/com/android/dialer/list/SmartDialNumberListAdapter.java b/src/com/android/dialer/list/SmartDialNumberListAdapter.java index 3696fb900..ed01baf2f 100644 --- a/src/com/android/dialer/list/SmartDialNumberListAdapter.java +++ b/src/com/android/dialer/list/SmartDialNumberListAdapter.java @@ -116,7 +116,7 @@ public class SmartDialNumberListAdapter extends DialerPhoneNumberListAdapter { public void setQueryString(String queryString) { final boolean showNumberShortcuts = !TextUtils.isEmpty(getFormattedQueryString()); boolean changed = false; - changed |= setShortcutEnabled(SHORTCUT_ADD_NUMBER_TO_CONTACTS, showNumberShortcuts); + changed |= setShortcutEnabled(SHORTCUT_ADD_TO_EXISTING_CONTACT, showNumberShortcuts); changed |= setShortcutEnabled(SHORTCUT_SEND_SMS_MESSAGE, showNumberShortcuts); changed |= setShortcutEnabled(SHORTCUT_MAKE_VIDEO_CALL, showNumberShortcuts && CallUtil.isVideoEnabled(getContext())); |