From 3b905e417acd9c5b3f0649cf03e9289a2dee8a04 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Mon, 7 May 2018 12:50:52 -0700
Subject: Config correct layout boundaries to accommodate long text (call log &
 bottom sheet)

Bug: 77835800
Test: Manual
PiperOrigin-RevId: 195706300
Change-Id: Iccc97d5cc3ab6f196dc917faf1d7b6659b06cf30
---
 .../calllog/ui/res/layout/new_call_log_entry.xml   | 75 ++++++++++------------
 .../res/layout/contact_layout.xml                  |  4 +-
 2 files changed, 35 insertions(+), 44 deletions(-)

(limited to 'java')

diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
index e3052c097..b0fb48f1a 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
@@ -29,26 +29,24 @@
       android:layout_marginEnd="10dp"
       android:layout_centerVertical="true"/>
 
-  <!-- The frame layout is necessary to avoid clipping the icons and ellipsize the text when the
-       content is too wide to fit.
-   -->
-  <FrameLayout
-      android:id="@+id/primary_row"
+  <LinearLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:layout_marginTop="14dp"
       android:layout_toEndOf="@+id/contact_photo_view"
-      android:layout_toStartOf="@+id/menu_button">
+      android:layout_toStartOf="@+id/menu_button"
+      android:orientation="vertical">
 
+    <!-- 1st row: primary info -->
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="14dp"
         android:orientation="horizontal">
 
       <TextView
           android:id="@+id/primary_text"
           style="@style/PrimaryText"
-          android:layout_width="wrap_content"
+          android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_weight="1"
           android:layout_marginEnd="6dp"
@@ -56,30 +54,26 @@
           android:lineSpacingMultiplier="1.5"
           android:singleLine="true"/>
 
-
       <ImageView
           android:id="@+id/hd_icon"
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
-          android:src="@drawable/quantum_ic_hd_vd_theme_24"
-          />
+          android:src="@drawable/quantum_ic_hd_vd_theme_24"/>
 
       <ImageView
           android:id="@+id/wifi_icon"
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
-          android:src="@drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24"
-          />
+          android:src="@drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24"/>
 
       <ImageView
           android:id="@+id/assisted_dial_icon"
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
-          android:src="@drawable/quantum_ic_language_vd_theme_24"
-          />
+          android:src="@drawable/quantum_ic_language_vd_theme_24"/>
 
       <TextView
           android:id="@+id/call_count"
@@ -90,43 +84,40 @@
           android:lineSpacingMultiplier="1.5"/>
 
     </LinearLayout>
-  </FrameLayout>
-
-  <LinearLayout
-      android:id="@+id/secondary_row"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/primary_row"
-      android:layout_toEndOf="@+id/contact_photo_view"
-      android:orientation="horizontal">
 
-    <ImageView
-        android:id="@+id/call_type_icon"
+    <!-- 2nd row: secondary info -->
+    <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="18dp"
-        android:layout_gravity="center_vertical"
-        />
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+      <ImageView
+          android:id="@+id/call_type_icon"
+          android:layout_width="wrap_content"
+          android:layout_height="18dp"
+          android:layout_gravity="center_vertical"/>
+
+      <TextView
+          android:id="@+id/secondary_text"
+          style="@style/SecondaryText"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:ellipsize="end"
+          android:lineSpacingMultiplier="1.4"
+          android:singleLine="true"/>
 
+    </LinearLayout>
+
+    <!-- 3rd row: phone account info -->
     <TextView
-        android:id="@+id/secondary_text"
+        android:id="@+id/phone_account"
         style="@style/SecondaryText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:lineSpacingMultiplier="1.4"
         android:singleLine="true"/>
-  </LinearLayout>
 
-  <TextView
-      android:id="@+id/phone_account"
-      style="@style/SecondaryText"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/secondary_row"
-      android:layout_toEndOf="@+id/contact_photo_view"
-      android:ellipsize="end"
-      android:singleLine="true"
-      android:visibility="visible"/>
+  </LinearLayout>
 
   <ImageView
       android:id="@+id/menu_button"
diff --git a/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml b/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml
index 721740f97..0790cf470 100644
--- a/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml
+++ b/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml
@@ -20,7 +20,8 @@
     android:layout_height="match_parent"
     android:paddingTop="12dp"
     android:paddingBottom="12dp"
-    android:paddingEnd="8dp"
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:background="#FFFFFF">
@@ -29,7 +30,6 @@
       android:id="@+id/contact_photo_view"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="10dp"
       android:layout_marginEnd="10dp"
       android:minHeight="@dimen/contact_actions_image_size"/>
 
-- 
cgit v1.2.3