Merge "Adjust HD and WFC icons." into mnc-dev

9 files changed, 5 insertions, 6 deletions

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
--- a/InCallUI/res/drawable-hdpi/ic_hd_18dp.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_hd_18dp.png b/InCallUI/res/drawable-hdpi/ic_hd_24dp.png
index 35bf51a4f..35bf51a4f 100644
--- a/InCallUI/res/drawable-xhdpi/ic_hd_18dp.png
+++ b/InCallUI/res/drawable-hdpi/ic_hd_24dp.png
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
--- a/InCallUI/res/drawable-mdpi/ic_hd_18dp.png
+++ /dev/null
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
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_hd_24dp.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_hd_24dp.png
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
--- a/InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png b/InCallUI/res/drawable-xxhdpi/ic_hd_24dp.png
index dd08bbbec..dd08bbbec 100644
--- a/InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png
+++ b/InCallUI/res/drawable-xxhdpi/ic_hd_24dp.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxxhdpi/ic_hd_24dp.png
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 -->