summaryrefslogtreecommitdiff
path: root/InCallUI/res
diff options
context:
space:
mode:
authorQi Wang <wangqi@google.com>2016-02-16 18:35:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-16 18:35:22 +0000
commit5974e8856b5317756edccf43b7f8407d5e09d68a (patch)
treef635ff3a6cabb69a536394632344c3c96fe87e6f /InCallUI/res
parent29ad99ae705536ce9902c60bd2dde121389d554c (diff)
parent331a0a44c2ec39f50a7b8649d44780616170165c (diff)
Merge "Fix overlapping of business icon with business name in primary call info."
Diffstat (limited to 'InCallUI/res')
-rw-r--r--InCallUI/res/layout/primary_call_info.xml10
1 files changed, 6 insertions, 4 deletions
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 2aa583c18..3eb363026 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"