commit b663fc95fe216d3f61880d2ea8ad6e487ae5b4ac
author Andrew Lee <anwlee@google.com> Thu Jun 25 17:52:03 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 17:52:09 2015 +0000
tree 4e34dbc8a876d0f8cc5e619c74d5de1aef9072d5
parent c046372eb5698828fc4236b3a629c5f429d1fe0a
parent 37df4a7bab3532ee8816e6cb45d676f52048aa17

Merge "Swap in right icon for messaging and info." into mnc-dev

src/com/android/contacts/common/list/ShortcutIntentBuilder.java

diff --git a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java b/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
index cc306f1..9e6b5e9 100644
--- a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
@@ -316,7 +316,7 @@
         } else {
             phoneUri = Uri.fromParts(ContactsUtils.SCHEME_SMSTO, phoneNumber, null);
             bitmap = generatePhoneNumberIcon(drawable, phoneType, phoneLabel,
-                    R.drawable.ic_textsms_24dp);
+                    R.drawable.ic_message_24dp);
         }
 
         Intent shortcutIntent = new Intent(shortcutAction, phoneUri);

src/com/android/contacts/common/model/account/BaseAccountType.java

diff --git a/src/com/android/contacts/common/model/account/BaseAccountType.java b/src/com/android/contacts/common/model/account/BaseAccountType.java
index c176a87..262a939 100644
--- a/src/com/android/contacts/common/model/account/BaseAccountType.java
+++ b/src/com/android/contacts/common/model/account/BaseAccountType.java
@@ -256,7 +256,7 @@
     protected DataKind addDataKindPhone(Context context) throws DefinitionException {
         DataKind kind = addKind(new DataKind(Phone.CONTENT_ITEM_TYPE, R.string.phoneLabelsGroup,
                 Weight.PHONE, true));
-        kind.iconAltRes = R.drawable.ic_text_holo_light;
+        kind.iconAltRes = R.drawable.ic_message_24dp;
         kind.iconAltDescriptionRes = R.string.sms;
         kind.actionHeader = new PhoneActionInflater();
         kind.actionAltHeader = new PhoneActionAltInflater();
@@ -1044,7 +1044,7 @@
                     Phone.CONTENT_ITEM_TYPE, Phone.TYPE, R.string.phoneLabelsGroup, Weight.PHONE,
                     new PhoneActionInflater(), new SimpleInflater(Phone.NUMBER));
 
-            kind.iconAltRes = R.drawable.ic_text_holo_light;
+            kind.iconAltRes = R.drawable.ic_message_24dp;
             kind.iconAltDescriptionRes = R.string.sms;
             kind.actionAltHeader = new PhoneActionAltInflater();