From 4ddcf52c410c0852785b2e15d1540c0c484750d0 Mon Sep 17 00:00:00 2001
From: "Cassie(Yitong) Wang" <cassieyw@google.com>
Date: Thu, 18 Jun 2020 21:59:34 +0000
Subject: Update dialpad layout

1. Put keypad on the left for both ltr and rtl
2. Fix UI problem for dialpad without type down list

Bug: 158604262
Bug: 151758762
Test: Manual
Change-Id: I317a0c0c518cc0ded7651b2e1f973435c7a601d7
---
 res/layout/dialpad_fragment_with_type_down.xml    | 12 +++----
 res/layout/dialpad_fragment_without_type_down.xml | 42 +++++++++--------------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/res/layout/dialpad_fragment_with_type_down.xml b/res/layout/dialpad_fragment_with_type_down.xml
index 547a9d3e..bdb1f490 100644
--- a/res/layout/dialpad_fragment_with_type_down.xml
+++ b/res/layout/dialpad_fragment_with_type_down.xml
@@ -26,16 +26,16 @@
         android:layout_width="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/call_button"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/divider"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/divider"/>
 
     <ImageView
         android:id="@+id/call_button"
         style="@style/DialpadPrimaryButton"
         android:src="@drawable/icon_call_button"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/divider"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/divider"/>
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/divider"
@@ -49,8 +49,8 @@
         android:layout_width="0dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/divider"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintLeft_toRightOf="@id/divider"
+        app:layout_constraintRight_toRightOf="parent">
         <include layout="@layout/dialpad_info"/>
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/dialpad_fragment_without_type_down.xml b/res/layout/dialpad_fragment_without_type_down.xml
index b61b6339..d1ee53bf 100644
--- a/res/layout/dialpad_fragment_without_type_down.xml
+++ b/res/layout/dialpad_fragment_without_type_down.xml
@@ -17,46 +17,38 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/type_down_guideline"
+        android:id="@+id/divider"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="@dimen/config_type_down_guideline_percent"/>
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5"/>
 
     <fragment
         android:id="@+id/dialpad_fragment"
         android:name="com.android.car.dialer.ui.dialpad.KeypadFragment"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_marginStart="@dimen/dialpad_info_margin_start"
-        app:layout_constraintTop_toBottomOf="@id/type_down_guideline"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dialpad_line_divider_height"
-        android:background="@color/divider_color"
-        android:layout_marginStart="@dimen/horizontal_divider_inset"
-        android:layout_marginEnd="@dimen/horizontal_divider_inset"
-        app:layout_constraintTop_toBottomOf="@id/type_down_guideline"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/divider"/>
 
     <include
         layout="@layout/dialpad_info"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="@id/dialpad_fragment"
-        app:layout_constraintBottom_toBottomOf="@id/dialpad_fragment"
-        app:layout_constraintStart_toEndOf="@id/dialpad_fragment"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintBottom_toTopOf="@+id/call_button"
+        app:layout_constraintLeft_toRightOf="@id/divider"
+        app:layout_constraintRight_toRightOf="parent"/>
 
-    <include
-        layout="@layout/list_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/type_down_guideline"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+    <ImageView
+        android:id="@+id/call_button"
+        style="@style/DialpadPrimaryButton"
+        android:src="@drawable/icon_call_button"
+        android:layout_marginBottom="@dimen/dialpad_info_edge_padding_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@id/divider"
+        app:layout_constraintRight_toRightOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-- 
cgit v1.2.3