Fix layout issues with Wi-Fi in-call status.

b/13890032

Change-Id: I6d34993acd2f608d808a786025ec9b07aff6dc09

1 files changed, 51 insertions, 41 deletions

diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index ed0ae54ad..cd1bcd63d 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -114,7 +114,7 @@
         </RelativeLayout>  <!-- End of call_banner -->
 
 
-        <LinearLayout android:id="@+id/supplementary_info_container"
+        <FrameLayout android:id="@+id/supplementary_info_container"
             style="@style/PrimaryCallInfoSupplementaryInfoContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -123,49 +123,59 @@
             android:background="@color/incall_secondary_info_background"
             android:animateLayoutChanges="true">
 
-            <TextView android:id="@+id/callServiceLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="@dimen/provider_info_top_bottom_padding"
-                android:paddingBottom="@dimen/provider_info_top_bottom_padding"
-                android:paddingStart="@dimen/call_banner_side_padding"
-                android:paddingEnd="@dimen/call_banner_side_padding"
-                android:gravity="start|center_vertical"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/incall_call_banner_text_color"
-                android:background="@android:color/transparent"
-                android:singleLine="true"
-                android:ellipsize="end" />
+            <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start|center_vertical"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/provider_info_top_bottom_padding"
+                    android:paddingBottom="@dimen/provider_info_top_bottom_padding"
+                    android:paddingStart="@dimen/call_banner_side_padding"
+                    android:paddingEnd="@dimen/call_banner_side_padding">
+                <ImageView android:id="@+id/callServiceIcon"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+                <TextView android:id="@+id/callServiceLabel"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="5dp"
+                        android:gravity="center"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@color/incall_call_banner_text_color"
+                        android:singleLine="true"
+                        android:ellipsize="end" />
+            </LinearLayout>
 
-            <View android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+            <LinearLayout
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                <!-- The "call state label": In some states, this shows a special
+                     indication like "Dialing" or "Incoming call" or "Call ended".
+                     It's unused for the normal case of an active ongoing call. -->
+                <TextView android:id="@+id/callStateLabel"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:paddingTop="@dimen/provider_info_top_bottom_padding"
+                          android:paddingBottom="@dimen/provider_info_top_bottom_padding"
+                          android:paddingStart="@dimen/call_banner_side_padding"
+                          android:paddingEnd="@dimen/call_banner_side_padding"
+                          android:textAppearance="?android:attr/textAppearanceSmall"
+                          android:textColor="@color/incall_call_banner_text_color"
+                          android:textAllCaps="true"
+                          android:singleLine="true"
+                          android:ellipsize="end" />
+
+                <Button android:id="@+id/connectionHandoffButton"
+                        android:text="@string/connection_handoff_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
 
-            <!-- The "call state label": In some states, this shows a special
-                 indication like "Dialing" or "Incoming call" or "Call ended".
-                 It's unused for the normal case of an active ongoing call. -->
-            <TextView android:id="@+id/callStateLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="@dimen/provider_info_top_bottom_padding"
-                android:paddingBottom="@dimen/provider_info_top_bottom_padding"
-                android:paddingStart="@dimen/call_banner_side_padding"
-                android:paddingEnd="@dimen/call_banner_side_padding"
-                android:gravity="end|center_vertical"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/incall_call_banner_text_color"
-                android:textAllCaps="true"
-                android:background="@android:color/transparent"
-                android:singleLine="true"
-                android:ellipsize="end" />
+            </LinearLayout>
 
-            <Button android:id="@+id/connectionHandoffButton"
-                    android:gravity="end|center_vertical"
-                    android:text="@string/connection_handoff_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone" />
-        </LinearLayout>
+        </FrameLayout>
 
     </LinearLayout>