commit edb7973fd19c726c4612626608839a591188f8f0
author Yorke Lee <yorkelee@google.com> Tue May 19 17:03:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 19 17:03:44 2015 +0000
tree 76458758a7f7cb03e738aaba47e1d0f0f690eff6
parent ac31db6275a44d6565976fb6640301444c30e151
parent 9b93ee28398fe8c160c377fd07e16da7948fef2e

am 176a0de9: Tweak some layouts so that very long numbers are wrapped

* commit '176a0de903f9d255dcc87ca6b70321553c1f42db':
  Tweak some layouts so that very long numbers are wrapped

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 7127d98..3763e24 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -108,11 +108,13 @@
         <LinearLayout android:id="@+id/labelAndNumber"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:orientation="horizontal">
 
             <TextView android:id="@+id/label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_weight="0"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="@color/incall_call_banner_subtext_color"
                 android:textSize="@dimen/call_label_text_size"
@@ -121,22 +123,23 @@
                 android:visibility="gone" />
 
             <TextView android:id="@+id/phoneNumber"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 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"
+                android:singleLine="false"
                 android:visibility="gone" />
 
         </LinearLayout>
 
         <!-- Elapsed time indication for a call in progress. -->
         <TextView android:id="@+id/elapsedTime"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_weight="0"
             android:textAlignment="viewEnd"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/incall_call_banner_subtext_color"