Snap for 6489494 from 11c7d0229350e26c6f13364d14aa99c01a7542a4 to mainline-release

Change-Id: I5788c239a6ac9e2605f51981c6b512164a93fc44

5 files changed, 75 insertions, 45 deletions

diff --git a/res/layout-port/dialpad_fragment.xml b/res/layout-port/dialpad_fragment.xml
index fd046c1c..6c28f31f 100644
--- a/res/layout-port/dialpad_fragment.xml
+++ b/res/layout-port/dialpad_fragment.xml
@@ -33,43 +33,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"/>
 
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/dialpad_info_title_container_size"
-        android:maxLines="1"
-        android:textAppearance="@style/TextAppearance.DialNumber"
-        android:autoSizeTextType="uniform"
-        android:autoSizeMinTextSize="@dimen/dialpad_info_title_text_size_min"
-        android:autoSizeMaxTextSize="@dimen/dialpad_info_title_text_size_max"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_constraintTop_toTopOf="@id/dialpad_fragment"
-        app:layout_constraintStart_toEndOf="@id/dialpad_fragment"
-        app:layout_constraintEnd_toStartOf="@+id/delete_button"
-        app:layout_goneMarginEnd="@dimen/dialpad_info_edge_padding_size"/>
-
-    <ImageButton
-        android:id="@+id/delete_button"
-        style="@style/DialpadSecondaryButton"
-        android:src="@drawable/ic_backspace"
-        android:layout_marginStart="@dimen/dialpad_info_title_padding_size"
-        android:layout_marginEnd="@dimen/dialpad_info_margin_end"
-        app:layout_constraintTop_toTopOf="@id/title"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintStart_toEndOf="@id/title"
-        app:layout_constraintEnd_toEndOf="parent"/>
-
-    <ImageView
-        android:id="@+id/call_button"
-        style="@style/DialpadPrimaryButton"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/call_button_height"
-        android:src="@drawable/icon_call_button"
-        android:layout_marginBottom="@dimen/call_button_bottom_margin"
-        app:layout_constraintBottom_toBottomOf="@id/dialpad_fragment"
-        app:layout_constraintStart_toEndOf="@id/dialpad_fragment"
-        app:layout_constraintEnd_toEndOf="parent"/>
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/dialpad_line_divider_height"
@@ -79,10 +42,11 @@
         app:layout_constraintTop_toBottomOf="@id/type_down_guideline"/>
 
     <include
-        layout="@layout/dialpad_user_profile"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/title"
+        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"/>
 
diff --git a/res/layout-port/dialpad_info.xml b/res/layout-port/dialpad_info.xml
new file mode 100644
index 00000000..8169ec2d
--- /dev/null
+++ b/res/layout-port/dialpad_info.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dialpad_info_title_container_size"
+        android:textDirection="ltr"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.DialNumber"
+        android:autoSizeTextType="uniform"
+        android:autoSizeMinTextSize="@dimen/dialpad_info_title_text_size_min"
+        android:autoSizeMaxTextSize="@dimen/dialpad_info_title_text_size_max"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/delete_button"
+        app:layout_goneMarginRight="@dimen/dialpad_info_edge_padding_size"/>
+
+    <ImageButton
+        android:id="@+id/delete_button"
+        style="@style/DialpadSecondaryButton"
+        android:src="@drawable/ic_backspace"
+        android:layout_marginStart="@dimen/dialpad_info_title_padding_size"
+        android:layout_marginEnd="@dimen/dialpad_info_margin_end"
+        app:layout_constraintTop_toTopOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="@id/title"
+        app:layout_constraintLeft_toRightOf="@id/title"
+        app:layout_constraintRight_toRightOf="parent"/>
+
+    <ImageView
+        android:id="@+id/call_button"
+        style="@style/DialpadPrimaryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/call_button_height"
+        android:src="@drawable/icon_call_button"
+        android:layout_marginBottom="@dimen/call_button_bottom_margin"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <include
+        layout="@layout/dialpad_user_profile"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintBottom_toTopOf="@+id/call_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/dialpad_info.xml b/res/layout/dialpad_info.xml
index 4219ba92..d92afd52 100644
--- a/res/layout/dialpad_info.xml
+++ b/res/layout/dialpad_info.xml
@@ -32,7 +32,7 @@
         android:layout_height="@dimen/dialpad_info_title_container_size"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.DialNumber"
-        android:gravity="center"
+        android:textDirection="ltr"
         android:autoSizeTextType="uniform"
         android:autoSizeMinTextSize="@dimen/dialpad_info_title_text_size_min"
         android:autoSizeMaxTextSize="@dimen/dialpad_info_title_text_size_max"
diff --git a/res/layout/dialpad_user_profile.xml b/res/layout/dialpad_user_profile.xml
index 90f4edec..7f85b19f 100644
--- a/res/layout/dialpad_user_profile.xml
+++ b/res/layout/dialpad_user_profile.xml
@@ -44,7 +44,7 @@
         android:id="@+id/dialpad_contact_avatar"
         android:layout_height="@dimen/dialpad_contact_avatar_size"
         android:layout_width="@dimen/dialpad_contact_avatar_size"
-        app:layout_constraintTop_toTopOf="@id/label"
+        app:layout_constraintTop_toBottomOf="@id/label"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/res/values/configs.xml b/res/values/configs.xml
index 2732ad34..c4f36714 100644
--- a/res/values/configs.xml
+++ b/res/values/configs.xml
@@ -19,8 +19,8 @@
     <bool name="config_enable_dial_motion">true</bool>
     <item name="config_dial_motion_scale_start" format="float" type="integer">1.5</item>
     <integer name="config_dial_motion_duration">200</integer>
-    <!-- 8388629 stands for Gravity.END | Gravity.CENTER_VERTICAL-->
-    <integer name="config_dialed_number_gravity">8388629</integer>
+    <!-- 21 stands for Gravity.RIGHT | Gravity.CENTER_VERTICAL-->
+    <integer name="config_dialed_number_gravity">21</integer>
     <item name="config_background_image_alpha" format="float" type="dimen">1.0</item>
     <item name="config_background_image_error_alpha" format="float" type="dimen">1.0</item>