From 8cdac35f2aa80d1732dfc5fdaee1a21035a1bfcb Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Mon, 2 Feb 2015 17:18:14 -0800
Subject: Show icon and network label when using Wifi.

+ Add Wifi icon and network label, to be shown when CAPABILITY_WIFI
is present on the primary call. Assume we can infer the network label
from the connection info returned by the WifiManager, supposing that
the phone can only be connected to one wifi network.
+ Add helper to strip quotation marks from wifi network name.
+ Reposition HD audio icon beneath the name, and to the left of the
number/location information.
+ Adjust assets and layout of call state and hd audio icons, to
center them in a more visually pleasing way in the view.

Bug: 19151850
Change-Id: Ic23d1e744960e80b65bc34a8e709266af508fe21
---
 InCallUI/res/drawable-hdpi/ic_hd_18dp.png          | Bin 0 -> 207 bytes
 InCallUI/res/drawable-hdpi/ic_hd_audio.png         | Bin 386 -> 0 bytes
 .../drawable-hdpi/ic_signal_wifi_4_bar_18dp.png    | Bin 0 -> 290 bytes
 InCallUI/res/drawable-mdpi/ic_hd_18dp.png          | Bin 0 -> 182 bytes
 InCallUI/res/drawable-mdpi/ic_hd_audio.png         | Bin 312 -> 0 bytes
 .../drawable-mdpi/ic_signal_wifi_4_bar_18dp.png    | Bin 0 -> 204 bytes
 InCallUI/res/drawable-xhdpi/ic_hd_18dp.png         | Bin 0 -> 236 bytes
 InCallUI/res/drawable-xhdpi/ic_hd_audio.png        | Bin 407 -> 0 bytes
 .../drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png   | Bin 0 -> 339 bytes
 InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png        | Bin 0 -> 309 bytes
 InCallUI/res/drawable-xxhdpi/ic_hd_audio.png       | Bin 564 -> 0 bytes
 .../drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png  | Bin 0 -> 474 bytes
 InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png       | Bin 0 -> 290 bytes
 InCallUI/res/drawable-xxxhdpi/ic_hd_audio.png      | Bin 638 -> 0 bytes
 .../drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.png | Bin 0 -> 619 bytes
 InCallUI/res/layout/primary_call_info.xml          |  57 ++++++++++++---------
 16 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 InCallUI/res/drawable-hdpi/ic_hd_18dp.png
 delete mode 100644 InCallUI/res/drawable-hdpi/ic_hd_audio.png
 create mode 100644 InCallUI/res/drawable-hdpi/ic_signal_wifi_4_bar_18dp.png
 create mode 100644 InCallUI/res/drawable-mdpi/ic_hd_18dp.png
 delete mode 100644 InCallUI/res/drawable-mdpi/ic_hd_audio.png
 create mode 100644 InCallUI/res/drawable-mdpi/ic_signal_wifi_4_bar_18dp.png
 create mode 100644 InCallUI/res/drawable-xhdpi/ic_hd_18dp.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/ic_hd_audio.png
 create mode 100644 InCallUI/res/drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png
 create mode 100644 InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/ic_hd_audio.png
 create mode 100644 InCallUI/res/drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png
 create mode 100644 InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png
 delete mode 100644 InCallUI/res/drawable-xxxhdpi/ic_hd_audio.png
 create mode 100644 InCallUI/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.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
new file mode 100644
index 000000000..ade1788c1
Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_hd_18dp.png differ
diff --git a/InCallUI/res/drawable-hdpi/ic_hd_audio.png b/InCallUI/res/drawable-hdpi/ic_hd_audio.png
deleted file mode 100644
index cccaf4949..000000000
Binary files a/InCallUI/res/drawable-hdpi/ic_hd_audio.png and /dev/null differ
diff --git a/InCallUI/res/drawable-hdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-hdpi/ic_signal_wifi_4_bar_18dp.png
new file mode 100644
index 000000000..d7b98055e
Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_signal_wifi_4_bar_18dp.png differ
diff --git a/InCallUI/res/drawable-mdpi/ic_hd_18dp.png b/InCallUI/res/drawable-mdpi/ic_hd_18dp.png
new file mode 100644
index 000000000..82c972646
Binary files /dev/null and b/InCallUI/res/drawable-mdpi/ic_hd_18dp.png differ
diff --git a/InCallUI/res/drawable-mdpi/ic_hd_audio.png b/InCallUI/res/drawable-mdpi/ic_hd_audio.png
deleted file mode 100644
index 6353b7acf..000000000
Binary files a/InCallUI/res/drawable-mdpi/ic_hd_audio.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-mdpi/ic_signal_wifi_4_bar_18dp.png
new file mode 100644
index 000000000..d537ab469
Binary files /dev/null and b/InCallUI/res/drawable-mdpi/ic_signal_wifi_4_bar_18dp.png differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_hd_18dp.png b/InCallUI/res/drawable-xhdpi/ic_hd_18dp.png
new file mode 100644
index 000000000..35bf51a4f
Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/ic_hd_18dp.png differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_hd_audio.png b/InCallUI/res/drawable-xhdpi/ic_hd_audio.png
deleted file mode 100644
index 6d05d45f5..000000000
Binary files a/InCallUI/res/drawable-xhdpi/ic_hd_audio.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png
new file mode 100644
index 000000000..5a5319212
Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/ic_signal_wifi_4_bar_18dp.png differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png b/InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png
new file mode 100644
index 000000000..510aa6e8b
Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_hd_18dp.png differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_hd_audio.png b/InCallUI/res/drawable-xxhdpi/ic_hd_audio.png
deleted file mode 100644
index 44294ba05..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/ic_hd_audio.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png
new file mode 100644
index 000000000..b627198f5
Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_signal_wifi_4_bar_18dp.png differ
diff --git a/InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png b/InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png
new file mode 100644
index 000000000..dd08bbbec
Binary files /dev/null and b/InCallUI/res/drawable-xxxhdpi/ic_hd_18dp.png differ
diff --git a/InCallUI/res/drawable-xxxhdpi/ic_hd_audio.png b/InCallUI/res/drawable-xxxhdpi/ic_hd_audio.png
deleted file mode 100644
index 459cd8f46..000000000
Binary files a/InCallUI/res/drawable-xxxhdpi/ic_hd_audio.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.png b/InCallUI/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.png
new file mode 100644
index 000000000..f4105ec8d
Binary files /dev/null and b/InCallUI/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_18dp.png differ
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 71369d479..8f0c0e24d 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -43,22 +43,21 @@
         <!-- Subscription provider or WiFi calling icon displayed to the left of the label -->
         <ImageView android:id="@+id/callStateIcon"
             android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginEnd="4dp"
-            android:baselineAlignBottom="true"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="8dp"
             android:tint="@color/incall_accent_color"
             android:alpha="0.0"
-            android:scaleType="centerInside"
+            android:scaleType="center"
             android:visibility="gone" />
 
         <ImageView android:id="@+id/videoCallIcon"
             android:src="@drawable/ic_toolbar_video"
             android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginEnd="4dp"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="16dp"
             android:baselineAlignBottom="true"
             android:tint="@color/incall_accent_color"
-            android:scaleType="centerInside"
+            android:scaleType="center"
             android:visibility="gone" />
 
         <TextView android:id="@+id/callStateLabel"
@@ -96,29 +95,38 @@
         android:clipChildren="false"
         android:clipToPadding="false">
 
+        <ImageView android:id="@+id/hdAudioIcon"
+            android:src="@drawable/ic_hd_18dp"
+            android:layout_width="16dp"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="8dp"
+            android:tint="@color/incall_call_banner_subtext_color"
+            android:scaleType="center"
+            android:visibility="gone" />
+
         <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
         <LinearLayout android:id="@+id/labelAndNumber"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-                <TextView android:id="@+id/label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="@color/incall_call_banner_subtext_color"
-                    android:textSize="@dimen/call_label_text_size"
-                    android:singleLine="true"
-                    android:textDirection="ltr" />
-
-                <TextView android:id="@+id/phoneNumber"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="@color/incall_call_banner_subtext_color"
-                    android:textSize="@dimen/call_label_text_size"
-                    android:singleLine="true" />
+            <TextView android:id="@+id/label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/incall_call_banner_subtext_color"
+                android:textSize="@dimen/call_label_text_size"
+                android:singleLine="true"
+                android:textDirection="ltr" />
+
+            <TextView android:id="@+id/phoneNumber"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/incall_call_banner_subtext_color"
+                android:textSize="@dimen/call_label_text_size"
+                android:singleLine="true" />
 
         </LinearLayout>
 
@@ -127,7 +135,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_centerVertical="true"
             android:textAlignment="viewEnd"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/incall_call_banner_subtext_color"
-- 
cgit v1.2.3