commit 5974e8856b5317756edccf43b7f8407d5e09d68a
author Qi Wang <wangqi@google.com> Tue Feb 16 18:35:22 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 16 18:35:22 2016 +0000
tree f635ff3a6cabb69a536394632344c3c96fe87e6f
parent 29ad99ae705536ce9902c60bd2dde121389d554c
parent 331a0a44c2ec39f50a7b8649d44780616170165c

Merge "Fix overlapping of business icon with business name in primary call info."

InCallUI/res/layout/primary_call_info.xml

diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 2aa583c..3eb3630 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -107,16 +107,18 @@
 
     </LinearLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
         <!-- Name (or the phone number, if we don't have a name to display). -->
         <com.android.phone.common.widget.ResizingTextTextView
             xmlns:ex="http://schemas.android.com/apk/res-auto"
             android:id="@+id/name"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:layout_marginTop="-5dp"
             android:fontFamily="sans-serif-light"
             android:textAlignment="viewStart"
@@ -134,7 +136,7 @@
             android:scaleType="centerCrop"
             android:importantForAccessibility="no"
             android:src="@drawable/img_no_image_automirrored" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"