Swap in right icon for messaging and info.

- Remove/replace older versions.

Bug: 22070564
Change-Id: I7dba27e960f20dab276b602746be32ccc10a0bcc

26 files changed, 23 insertions, 4 deletions

diff --git a/res/drawable-hdpi/ic_info_outline_24dp.png b/res/drawable-hdpi/ic_info_outline_24dp.png
new file mode 100644
index 00000000..c7b1113c
--- /dev/null
+++ b/res/drawable-hdpi/ic_info_outline_24dp.png
diff --git a/res/drawable-hdpi/ic_message_24dp.png b/res/drawable-hdpi/ic_message_24dp.png
new file mode 100644
index 00000000..57177b7c
--- /dev/null
+++ b/res/drawable-hdpi/ic_message_24dp.png
diff --git a/res/drawable-hdpi/ic_text_holo_light.png b/res/drawable-hdpi/ic_text_holo_light.png
deleted file mode 100644
index 01af1898..00000000
--- a/res/drawable-hdpi/ic_text_holo_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_textsms_24dp.png b/res/drawable-hdpi/ic_textsms_24dp.png
deleted file mode 100644
index 12a1ef86..00000000
--- a/res/drawable-hdpi/ic_textsms_24dp.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-hdpi/ic_text_holo_light.png b/res/drawable-ldrtl-hdpi/ic_text_holo_light.png
deleted file mode 100644
index 0f2e9f4b..00000000
--- a/res/drawable-ldrtl-hdpi/ic_text_holo_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-mdpi/ic_text_holo_light.png b/res/drawable-ldrtl-mdpi/ic_text_holo_light.png
deleted file mode 100644
index 33e4ba51..00000000
--- a/res/drawable-ldrtl-mdpi/ic_text_holo_light.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xhdpi/ic_text_holo_light.png b/res/drawable-ldrtl-xhdpi/ic_text_holo_light.png
deleted file mode 100644
index 374aab74..00000000
--- a/res/drawable-ldrtl-xhdpi/ic_text_holo_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_info_outline_24dp.png b/res/drawable-mdpi/ic_info_outline_24dp.png
new file mode 100644
index 00000000..353e0649
--- /dev/null
+++ b/res/drawable-mdpi/ic_info_outline_24dp.png
diff --git a/res/drawable-mdpi/ic_message_24dp.png b/res/drawable-mdpi/ic_message_24dp.png
new file mode 100644
index 00000000..3072b756
--- /dev/null
+++ b/res/drawable-mdpi/ic_message_24dp.png
diff --git a/res/drawable-mdpi/ic_text_holo_light.png b/res/drawable-mdpi/ic_text_holo_light.png
deleted file mode 100644
index 76dae054..00000000
--- a/res/drawable-mdpi/ic_text_holo_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_textsms_24dp.png b/res/drawable-mdpi/ic_textsms_24dp.png
deleted file mode 100644
index 0ef0ad9c..00000000
--- a/res/drawable-mdpi/ic_textsms_24dp.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_info_outline_24dp.png b/res/drawable-xhdpi/ic_info_outline_24dp.png
new file mode 100644
index 00000000..c571b2e3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_info_outline_24dp.png
diff --git a/res/drawable-xhdpi/ic_message_24dp.png b/res/drawable-xhdpi/ic_message_24dp.png
new file mode 100644
index 00000000..763767b4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_message_24dp.png
diff --git a/res/drawable-xhdpi/ic_text_holo_light.png b/res/drawable-xhdpi/ic_text_holo_light.png
deleted file mode 100644
index 6fb8e92a..00000000
--- a/res/drawable-xhdpi/ic_text_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_textsms_24dp.png b/res/drawable-xhdpi/ic_textsms_24dp.png
deleted file mode 100644
index 9818088d..00000000
--- a/res/drawable-xhdpi/ic_textsms_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_info_outline_24dp.png b/res/drawable-xxhdpi/ic_info_outline_24dp.png
new file mode 100644
index 00000000..c41a5fcf
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_info_outline_24dp.png
diff --git a/res/drawable-xxhdpi/ic_message_24dp.png b/res/drawable-xxhdpi/ic_message_24dp.png
new file mode 100644
index 00000000..0a79824b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_message_24dp.png
diff --git a/res/drawable-xxhdpi/ic_text_holo_light.png b/res/drawable-xxhdpi/ic_text_holo_light.png
deleted file mode 100644
index 19ea88f2..00000000
--- a/res/drawable-xxhdpi/ic_text_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_textsms_24dp.png b/res/drawable-xxhdpi/ic_textsms_24dp.png
deleted file mode 100644
index a3d45a5a..00000000
--- a/res/drawable-xxhdpi/ic_textsms_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_info_outline_24dp.png b/res/drawable-xxxhdpi/ic_info_outline_24dp.png
new file mode 100644
index 00000000..3a82cab3
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_info_outline_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_message_24dp.png b/res/drawable-xxxhdpi/ic_message_24dp.png
new file mode 100644
index 00000000..fa7c17ac
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_message_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_textsms_24dp.png b/res/drawable-xxxhdpi/ic_textsms_24dp.png
deleted file mode 100644
index 4f23ef58..00000000
--- a/res/drawable-xxxhdpi/ic_textsms_24dp.png
+++ /dev/null
diff --git a/res/drawable/ic_message_24dp.xml b/res/drawable/ic_message_24dp.xml
new file mode 100644
index 00000000..b1bd7439
--- /dev/null
+++ b/res/drawable/ic_message_24dp.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_message_24dp"
+    android:autoMirrored="true" />
diff --git a/res/drawable/ic_person_add_tinted_24dp.xml b/res/drawable/ic_person_add_tinted_24dp.xml
index 6d79663f..3bbf4bd4 100644
--- a/res/drawable/ic_person_add_tinted_24dp.xml
+++ b/res/drawable/ic_person_add_tinted_24dp.xml
@@ -17,4 +17,4 @@
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_person_add_24dp"
     android:autoMirrored="true"
-    android:tint="@color/actionbar_icon_color" />
\ No newline at end of file
+    android:tint="@color/actionbar_icon_color" />
diff --git a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java b/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
index cc306f1f..9e6b5e95 100644
--- a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
@@ -316,7 +316,7 @@ public class ShortcutIntentBuilder {
         } 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);
diff --git a/src/com/android/contacts/common/model/account/BaseAccountType.java b/src/com/android/contacts/common/model/account/BaseAccountType.java
index c176a870..262a9390 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 @@ public abstract class BaseAccountType extends AccountType {
     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 @@ public abstract class BaseAccountType extends AccountType {
                     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();