Change add contact shortcut to be for "existing".
We're going to "fork" the add action into "existing" and "new".
This converts the existing shortcut action to the scenario for
adding to an existing contact, and the action for adding to a new
contact will be added as a follow up.
Bug: 19372539
Change-Id: I9e78fa5637a6f0ff22ce1d74bca3fe98e531242f
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b100f6..07460ec 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 86e8528..0899372 100644
--- a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
+++ b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
@@ -27,7 +27,7 @@
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 @@
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 9d6694a..87d4fd2 100644
--- a/src/com/android/dialer/list/RegularSearchListAdapter.java
+++ b/src/com/android/dialer/list/RegularSearchListAdapter.java
@@ -69,10 +69,7 @@
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 ba01438..e609362 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -163,7 +163,7 @@
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 3696fb9..ed01baf 100644
--- a/src/com/android/dialer/list/SmartDialNumberListAdapter.java
+++ b/src/com/android/dialer/list/SmartDialNumberListAdapter.java
@@ -116,7 +116,7 @@
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()));