From dcbb1fc1bcf3fa763a73929ddbe3a6075b06494b Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Tue, 21 Apr 2015 11:19:14 -0700
Subject: Adjust HD and WFC icons.

Adjust sizes, assets, and positionings.

Bug: 20338455
Change-Id: I3913eb60cf1c05f8a89208f9c0247ffcc3e1ec27
---
 InCallUI/res/drawable-hdpi/ic_hd_18dp.png    | Bin 207 -> 0 bytes
 InCallUI/res/drawable-hdpi/ic_hd_24dp.png    | Bin 0 -> 236 bytes
 InCallUI/res/drawable-mdpi/ic_hd_18dp.png    | Bin 182 -> 0 bytes
 InCallUI/res/drawable-mdpi/ic_hd_24dp.png    | Bin 0 -> 154 bytes
 InCallUI/res/drawable-xhdpi/ic_hd_18dp.png   | Bin 236 -> 0 bytes
 InCallUI/res/drawable-xhdpi/ic_hd_24dp.png   | Bin 0 -> 201 bytes
 InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png  | Bin 309 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/ic_hd_24dp.png  | Bin 0 -> 290 bytes
 InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png | Bin 290 -> 0 bytes
 InCallUI/res/drawable-xxxhdpi/ic_hd_24dp.png | Bin 0 -> 348 bytes
 InCallUI/res/layout/primary_call_info.xml    |  11 +++++------
 11 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 InCallUI/res/drawable-hdpi/ic_hd_18dp.png
 create mode 100644 InCallUI/res/drawable-hdpi/ic_hd_24dp.png
 delete mode 100644 InCallUI/res/drawable-mdpi/ic_hd_18dp.png
 create mode 100644 InCallUI/res/drawable-mdpi/ic_hd_24dp.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/ic_hd_18dp.png
 create mode 100644 InCallUI/res/drawable-xhdpi/ic_hd_24dp.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png
 create mode 100644 InCallUI/res/drawable-xxhdpi/ic_hd_24dp.png
 delete mode 100644 InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png
 create mode 100644 InCallUI/res/drawable-xxxhdpi/ic_hd_24dp.png

(limited to 'InCallUI/res')

diff --git a/InCallUI/res/drawable-hdpi/ic_hd_18dp.png b/InCallUI/res/drawable-hdpi/ic_hd_18dp.png
deleted file mode 100644
index ade1788c1..000000000
Binary files a/InCallUI/res/drawable-hdpi/ic_hd_18dp.png and /dev/null differ
diff --git a/InCallUI/res/drawable-hdpi/ic_hd_24dp.png b/InCallUI/res/drawable-hdpi/ic_hd_24dp.png
new file mode 100644
index 000000000..35bf51a4f
Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_hd_24dp.png differ
diff --git a/InCallUI/res/drawable-mdpi/ic_hd_18dp.png b/InCallUI/res/drawable-mdpi/ic_hd_18dp.png
deleted file mode 100644
index 82c972646..000000000
Binary files a/InCallUI/res/drawable-mdpi/ic_hd_18dp.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/ic_hd_24dp.png b/InCallUI/res/drawable-mdpi/ic_hd_24dp.png
new file mode 100644
index 000000000..30938fe4d
Binary files /dev/null and b/InCallUI/res/drawable-mdpi/ic_hd_24dp.png differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_hd_18dp.png b/InCallUI/res/drawable-xhdpi/ic_hd_18dp.png
deleted file mode 100644
index 35bf51a4f..000000000
Binary files a/InCallUI/res/drawable-xhdpi/ic_hd_18dp.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_hd_24dp.png b/InCallUI/res/drawable-xhdpi/ic_hd_24dp.png
new file mode 100644
index 000000000..4c954d86f
Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/ic_hd_24dp.png differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png b/InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png
deleted file mode 100644
index 510aa6e8b..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_hd_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_hd_24dp.png
new file mode 100644
index 000000000..dd08bbbec
Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_hd_24dp.png differ
diff --git a/InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png b/InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png
deleted file mode 100644
index dd08bbbec..000000000
Binary files a/InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxxhdpi/ic_hd_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_hd_24dp.png
new file mode 100644
index 000000000..3f87b882e
Binary files /dev/null and b/InCallUI/res/drawable-xxxhdpi/ic_hd_24dp.png differ
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 1dc4e78d8..7127d9815 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -42,13 +42,12 @@
 
         <!-- Subscription provider or WiFi calling icon displayed to the left of the label -->
         <ImageView android:id="@+id/callStateIcon"
-            android:layout_width="16dp"
+            android:layout_width="24dp"
             android:layout_height="match_parent"
-            android:layout_marginStart="6dp"
             android:layout_marginEnd="10dp"
             android:tint="@color/incall_accent_color"
             android:alpha="0.0"
-            android:scaleType="center"
+            android:scaleType="fitCenter"
             android:visibility="gone" />
 
         <ImageView android:id="@+id/videoCallIcon"
@@ -97,12 +96,12 @@
         android:clipToPadding="false">
 
         <ImageView android:id="@+id/hdAudioIcon"
-            android:src="@drawable/ic_hd_18dp"
-            android:layout_width="16dp"
+            android:src="@drawable/ic_hd_24dp"
+            android:layout_width="24dp"
             android:layout_height="match_parent"
             android:layout_marginEnd="8dp"
             android:tint="@color/incall_call_banner_subtext_color"
-            android:scaleType="center"
+            android:scaleType="fitCenter"
             android:visibility="gone" />
 
         <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
-- 
cgit v1.2.3