Uses predefined icons for google properties in the contact card

Change-Id: Ie17444f6923cfe9708005862ad262b9445c02a01

21 files changed, 6 insertions, 3 deletions

diff --git a/res/drawable-hdpi/ic_add_to_circles_black_24.png b/res/drawable-hdpi/ic_add_to_circles_black_24.png
new file mode 100644
index 000000000..6eb1fcca1
--- /dev/null
+++ b/res/drawable-hdpi/ic_add_to_circles_black_24.png
diff --git a/res/drawable-hdpi/ic_google_plus_24dp.png b/res/drawable-hdpi/ic_google_plus_24dp.png
new file mode 100644
index 000000000..af17f2b00
--- /dev/null
+++ b/res/drawable-hdpi/ic_google_plus_24dp.png
diff --git a/res/drawable-hdpi/ic_hangout_24dp.png b/res/drawable-hdpi/ic_hangout_24dp.png
new file mode 100644
index 000000000..496a2a0d7
--- /dev/null
+++ b/res/drawable-hdpi/ic_hangout_24dp.png
diff --git a/res/drawable-hdpi/ic_hangout_video_24dp.png b/res/drawable-hdpi/ic_hangout_video_24dp.png
new file mode 100644
index 000000000..0825a1573
--- /dev/null
+++ b/res/drawable-hdpi/ic_hangout_video_24dp.png
diff --git a/res/drawable-mdpi/ic_add_to_circles_black_24.png b/res/drawable-mdpi/ic_add_to_circles_black_24.png
new file mode 100644
index 000000000..fbffc97fe
--- /dev/null
+++ b/res/drawable-mdpi/ic_add_to_circles_black_24.png
diff --git a/res/drawable-mdpi/ic_google_plus_24dp.png b/res/drawable-mdpi/ic_google_plus_24dp.png
new file mode 100644
index 000000000..d8eacf0f9
--- /dev/null
+++ b/res/drawable-mdpi/ic_google_plus_24dp.png
diff --git a/res/drawable-mdpi/ic_hangout_24dp.png b/res/drawable-mdpi/ic_hangout_24dp.png
new file mode 100644
index 000000000..1b0acfd09
--- /dev/null
+++ b/res/drawable-mdpi/ic_hangout_24dp.png
diff --git a/res/drawable-mdpi/ic_hangout_video_24dp.png b/res/drawable-mdpi/ic_hangout_video_24dp.png
new file mode 100644
index 000000000..b54b1cb49
--- /dev/null
+++ b/res/drawable-mdpi/ic_hangout_video_24dp.png
diff --git a/res/drawable-xhdpi/ic_add_to_circles_black_24.png b/res/drawable-xhdpi/ic_add_to_circles_black_24.png
new file mode 100644
index 000000000..79116b510
--- /dev/null
+++ b/res/drawable-xhdpi/ic_add_to_circles_black_24.png
diff --git a/res/drawable-xhdpi/ic_google_plus_24dp.png b/res/drawable-xhdpi/ic_google_plus_24dp.png
new file mode 100644
index 000000000..ea352d31c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_google_plus_24dp.png
diff --git a/res/drawable-xhdpi/ic_hangout_24dp.png b/res/drawable-xhdpi/ic_hangout_24dp.png
new file mode 100644
index 000000000..0cd779546
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hangout_24dp.png
diff --git a/res/drawable-xhdpi/ic_hangout_video_24dp.png b/res/drawable-xhdpi/ic_hangout_video_24dp.png
new file mode 100644
index 000000000..97b984c28
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hangout_video_24dp.png
diff --git a/res/drawable-xxhdpi/ic_add_to_circles_black_24.png b/res/drawable-xxhdpi/ic_add_to_circles_black_24.png
new file mode 100644
index 000000000..23a2084a7
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_add_to_circles_black_24.png
diff --git a/res/drawable-xxhdpi/ic_google_plus_24dp.png b/res/drawable-xxhdpi/ic_google_plus_24dp.png
new file mode 100644
index 000000000..933cd627b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_google_plus_24dp.png
diff --git a/res/drawable-xxhdpi/ic_hangout_24dp.png b/res/drawable-xxhdpi/ic_hangout_24dp.png
new file mode 100644
index 000000000..16858d1a8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hangout_24dp.png
diff --git a/res/drawable-xxhdpi/ic_hangout_video_24dp.png b/res/drawable-xxhdpi/ic_hangout_video_24dp.png
new file mode 100644
index 000000000..4183c76d4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hangout_video_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_google_plus_24dp.png b/res/drawable-xxxhdpi/ic_google_plus_24dp.png
new file mode 100644
index 000000000..dcd6c9711
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_google_plus_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_hangout_24dp.png b/res/drawable-xxxhdpi/ic_hangout_24dp.png
new file mode 100644
index 000000000..4bfdb0df5
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_hangout_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_hangout_video_24dp.png b/res/drawable-xxxhdpi/ic_hangout_video_24dp.png
new file mode 100644
index 000000000..f1be2e73b
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_hangout_video_24dp.png
diff --git a/res/layout/expanding_entry_card_item.xml b/res/layout/expanding_entry_card_item.xml
index 46fc8cbdd..99738a6ac 100644
--- a/res/layout/expanding_entry_card_item.xml
+++ b/res/layout/expanding_entry_card_item.xml
@@ -26,11 +26,12 @@
 
     <ImageView
         android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/expanding_entry_card_item_icon_height"
+        android:layout_height="@dimen/expanding_entry_card_item_icon_width"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:layout_marginEnd="@dimen/expanding_entry_card_item_image_spacing" />
+        android:layout_marginEnd="@dimen/expanding_entry_card_item_image_spacing"
+        android:scaleType="fitCenter" />
 
     <TextView
         android:id="@+id/header"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ce04992b6..0e296fe1c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -186,4 +186,6 @@
 
     <dimen name="people_activity_card_elevation">2dp</dimen>
 
+    <dimen name="expanding_entry_card_item_icon_height">24dp</dimen>
+    <dimen name="expanding_entry_card_item_icon_width">24dp</dimen>
 </resources>