Update InCallUI for "generic" conference calls.

+ Use the newer "phone" asset (same as emergency calls).
+ Add xxxhdpi phone asset.
- Remove unused assets.
+ Tint the subscription icon properly in secondary call info.
+ Reorganize listeners in CallCardFragment to be less
redundant, and so FAB is properly positioned above the secondary
call info.

Bug: 17581379
Change-Id: Id4f1c1659ab8c17313cdd0393be51954b5cd449a

21 files changed, 4 insertions, 2 deletions

diff --git a/InCallUI/res/drawable-hdpi/img_emergency.png b/InCallUI/res/drawable-hdpi/img_emergency.png
deleted file mode 100644
index 7e5eff48d..000000000
--- a/InCallUI/res/drawable-hdpi/img_emergency.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/img_phone.png b/InCallUI/res/drawable-hdpi/img_phone.png
new file mode 100644
index 000000000..748312e6e
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/img_phone.png
diff --git a/InCallUI/res/drawable-hdpi/picture_dialing.png b/InCallUI/res/drawable-hdpi/picture_dialing.png
deleted file mode 100644
index 6311f693b..000000000
--- a/InCallUI/res/drawable-hdpi/picture_dialing.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/picture_unknown.png b/InCallUI/res/drawable-hdpi/picture_unknown.png
deleted file mode 100644
index 297480e5f..000000000
--- a/InCallUI/res/drawable-hdpi/picture_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/picture_unknown.png b/InCallUI/res/drawable-ldrtl-hdpi/picture_unknown.png
deleted file mode 100644
index 3b81ff3e7..000000000
--- a/InCallUI/res/drawable-ldrtl-hdpi/picture_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/picture_unknown.png b/InCallUI/res/drawable-ldrtl-mdpi/picture_unknown.png
deleted file mode 100644
index 062faf5f5..000000000
--- a/InCallUI/res/drawable-ldrtl-mdpi/picture_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/picture_unknown.png b/InCallUI/res/drawable-ldrtl-xhdpi/picture_unknown.png
deleted file mode 100644
index 1f57aa1a1..000000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/picture_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/img_emergency.png b/InCallUI/res/drawable-mdpi/img_emergency.png
deleted file mode 100644
index 0209eb9d1..000000000
--- a/InCallUI/res/drawable-mdpi/img_emergency.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/img_phone.png b/InCallUI/res/drawable-mdpi/img_phone.png
new file mode 100644
index 000000000..41a1d339d
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/img_phone.png
diff --git a/InCallUI/res/drawable-mdpi/picture_dialing.png b/InCallUI/res/drawable-mdpi/picture_dialing.png
deleted file mode 100644
index b81b6037e..000000000
--- a/InCallUI/res/drawable-mdpi/picture_dialing.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/picture_unknown.png b/InCallUI/res/drawable-mdpi/picture_unknown.png
deleted file mode 100644
index dd043d41f..000000000
--- a/InCallUI/res/drawable-mdpi/picture_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/img_emergency.png b/InCallUI/res/drawable-xhdpi/img_emergency.png
deleted file mode 100644
index 5c00d9d55..000000000
--- a/InCallUI/res/drawable-xhdpi/img_emergency.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/img_phone.png b/InCallUI/res/drawable-xhdpi/img_phone.png
new file mode 100644
index 000000000..2e0ceec0f
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/img_phone.png
diff --git a/InCallUI/res/drawable-xhdpi/picture_dialing.png b/InCallUI/res/drawable-xhdpi/picture_dialing.png
deleted file mode 100644
index 792cd8efe..000000000
--- a/InCallUI/res/drawable-xhdpi/picture_dialing.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/picture_unknown.png b/InCallUI/res/drawable-xhdpi/picture_unknown.png
deleted file mode 100644
index 0525c86c3..000000000
--- a/InCallUI/res/drawable-xhdpi/picture_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/img_emergency.png b/InCallUI/res/drawable-xxhdpi/img_phone.png
index 4eaaba509..4eaaba509 100644
--- a/InCallUI/res/drawable-xxhdpi/img_emergency.png
+++ b/InCallUI/res/drawable-xxhdpi/img_phone.png
diff --git a/InCallUI/res/drawable-xxhdpi/picture_dialing.png b/InCallUI/res/drawable-xxhdpi/picture_dialing.png
deleted file mode 100644
index 17d45f55b..000000000
--- a/InCallUI/res/drawable-xxhdpi/picture_dialing.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/picture_unknown.png b/InCallUI/res/drawable-xxhdpi/picture_unknown.png
deleted file mode 100644
index e6a95fa21..000000000
--- a/InCallUI/res/drawable-xxhdpi/picture_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxxhdpi/img_emergency.png b/InCallUI/res/drawable-xxxhdpi/img_phone.png
index 7cbfbd75e..7cbfbd75e 100644
--- a/InCallUI/res/drawable-xxxhdpi/img_emergency.png
+++ b/InCallUI/res/drawable-xxxhdpi/img_phone.png
diff --git a/InCallUI/res/drawable-xxxhdpi/picture_unknown.png b/InCallUI/res/drawable-xxxhdpi/picture_unknown.png
deleted file mode 100644
index 216574222..000000000
--- a/InCallUI/res/drawable-xxxhdpi/picture_unknown.png
+++ /dev/null
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index 772a29bc1..8666c2ae8 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml
@@ -21,7 +21,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:background="@color/incall_banner_secondary_background_color">
+    android:background="@color/incall_banner_secondary_background_color"
+    android:visibility="gone">
 
     <Space android:layout_width="match_parent"
         android:layout_height="1dp"
@@ -73,7 +74,8 @@
                     android:layout_height="@dimen/call_provider_small_icon_size"
                     android:layout_marginRight="2dp"
                     android:baselineAlignBottom="true"
-                    android:scaleType="centerInside" />
+                    android:scaleType="centerInside"
+                    android:tint="@color/incall_banner_secondary_text_color" />
 
                 <TextView android:id="@+id/secondaryCallProviderLabel"
                     android:layout_width="match_parent"