From 49c5ea2e3085ff4f54b75a936b5a37ae96452b70 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Thu, 26 Apr 2018 12:55:28 -0700
Subject: Fix bug that title of RTT call is not centered.

This change also increase the button size for easier clicking.

Bug: 76207637
Test: manual
PiperOrigin-RevId: 194440220
Change-Id: I1d5742876e4a9ce27b81182e2abd5d2a27c71790
---
 .../incallui/rtt/impl/res/layout/rtt_banner.xml    | 33 +++++++++++-----------
 .../incallui/rtt/impl/res/values/dimens.xml        |  3 ++
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'java/com/android/incallui/rtt/impl')

diff --git a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
index 4b03ad8d5..8a5bba28d 100644
--- a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
+++ b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
@@ -19,30 +19,30 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
-  <RelativeLayout
+  <LinearLayout
       android:layout_width="match_parent"
-      android:layout_height="?android:attr/actionBarSize"
+      android:layout_height="@dimen/rtt_banner_height"
       android:background="#F305228F"
-      android:elevation="3dp">
+      android:elevation="3dp"
+      android:orientation="horizontal">
     <ImageButton
         android:id="@+id/rtt_end_call_button"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginStart="16dp"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
+        android:layout_width="@dimen/rtt_banner_height"
+        android:layout_height="@dimen/rtt_banner_height"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:padding="@dimen/rtt_banner_button_padding"
         android:background="@android:color/transparent"
         android:contentDescription="@string/incall_content_description_end_call"
         android:scaleType="fitXY"
         android:src="@drawable/quantum_ic_call_end_vd_theme_24"
         android:tint="#FFDF0000"/>
     <LinearLayout
-        android:layout_width="260dp"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
+        android:layout_weight="1"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:layout_marginStart="32dp"
-        android:layout_toEndOf="@id/rtt_end_call_button"
         android:orientation="vertical">
       <TextView
           android:id="@+id/rtt_name_or_number"
@@ -67,18 +67,17 @@
     </LinearLayout>
     <ImageButton
         android:id="@+id/rtt_overflow_button"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginEnd="12dp"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
+        android:layout_width="@dimen/rtt_banner_height"
+        android:layout_height="@dimen/rtt_banner_height"
+        android:layout_marginStart="8dp"
+        android:padding="@dimen/rtt_banner_button_padding"
         android:background="@android:color/transparent"
         android:contentDescription="@string/content_description_overflow"
         android:scaleType="fitXY"
         android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
         android:tint="#FFFFFF"/>
 
-  </RelativeLayout>
+  </LinearLayout>
   <FrameLayout
       android:id="@id/rtt_on_hold_banner"
       android:layout_width="match_parent"
diff --git a/java/com/android/incallui/rtt/impl/res/values/dimens.xml b/java/com/android/incallui/rtt/impl/res/values/dimens.xml
index c3d28da77..cab9da00c 100644
--- a/java/com/android/incallui/rtt/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/rtt/impl/res/values/dimens.xml
@@ -20,4 +20,7 @@
   <dimen name="rtt_overflow_menu_width">180dp</dimen>
   <dimen name="rtt_overflow_menu_elevation">8dp</dimen>
   <dimen name="rtt_avatar_size">40dp</dimen>
+  <dimen name="rtt_banner_height">56dp</dimen>
+  <!-- This is used to control image size inside the button. -->
+  <dimen name="rtt_banner_button_padding">12dp</dimen>
 </resources>
-- 
cgit v1.2.3