Snap for 6559824 from 16c8e81e292b4ce2feb32c4a6640316d195f8a21 to mainline-release

Change-Id: Ibf2b4887c6d33631cc73c5d27870b8341db62739

11 files changed, 18 insertions, 2 deletions

diff --git a/res/layout-port/user_profile_large.xml b/res/layout-port/user_profile_large.xml
index fbc601c6..71a94fb0 100644
--- a/res/layout-port/user_profile_large.xml
+++ b/res/layout-port/user_profile_large.xml
@@ -25,6 +25,7 @@ limitations under the License.
         android:id="@+id/user_profile_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:theme="@style/Theme.Dialer.BidiText"
         android:textAppearance="@style/TextAppearance.InCallUserTitle"
         android:paddingTop="@dimen/in_call_margin_between_avatar_and_text"
         android:singleLine="true"/>
@@ -32,6 +33,7 @@ limitations under the License.
         android:id="@+id/user_profile_phone_number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:theme="@style/Theme.Dialer.BidiText"
         android:textAppearance="@style/TextAppearance.InCallUserPhoneNumber"
         android:singleLine="true"
         android:paddingTop="@dimen/in_call_phone_number_margin_top"/>
diff --git a/res/layout-w1280dp/type_down_list_item.xml b/res/layout-w1280dp/type_down_list_item.xml
index fec8a538..28afee48 100644
--- a/res/layout-w1280dp/type_down_list_item.xml
+++ b/res/layout-w1280dp/type_down_list_item.xml
@@ -50,6 +50,7 @@
         android:id="@+id/phone_number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:theme="@style/Theme.Dialer.BidiText"
         android:singleLine="true"
         app:layout_constraintTop_toBottomOf="@id/contact_name"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/res/layout/call_history_list_item.xml b/res/layout/call_history_list_item.xml
index 813a5e1b..e45efca3 100644
--- a/res/layout/call_history_list_item.xml
+++ b/res/layout/call_history_list_item.xml
@@ -57,6 +57,7 @@ limitations under the License.
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:theme="@style/Theme.Dialer.BidiText"
         android:layout_marginEnd="@dimen/call_history_text_margin_end"
         android:singleLine="true"
         app:layout_constraintVertical_chainStyle="packed"
diff --git a/res/layout/contact_details_address.xml b/res/layout/contact_details_address.xml
index cd15f661..61e62420 100644
--- a/res/layout/contact_details_address.xml
+++ b/res/layout/contact_details_address.xml
@@ -35,6 +35,7 @@
 
         <TextView
             android:id="@+id/title"
+            android:theme="@style/Theme.Dialer.BidiText"
             android:textAppearance="@style/TextAppearance.ContactDetailsListTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/contact_details_number.xml b/res/layout/contact_details_number.xml
index c7ef8cb5..30b0b1ab 100644
--- a/res/layout/contact_details_number.xml
+++ b/res/layout/contact_details_number.xml
@@ -35,6 +35,7 @@
 
         <TextView
             android:id="@+id/title"
+            android:theme="@style/Theme.Dialer.BidiText"
             android:textAppearance="@style/TextAppearance.ContactDetailsListTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/onhold_user_profile.xml b/res/layout/onhold_user_profile.xml
index 235a013c..1b048772 100644
--- a/res/layout/onhold_user_profile.xml
+++ b/res/layout/onhold_user_profile.xml
@@ -46,6 +46,7 @@
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:theme="@style/Theme.Dialer.BidiText"
             android:layout_marginEnd="@dimen/onhold_profile_status_margin"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:singleLine="true"
diff --git a/res/layout/type_down_list_item.xml b/res/layout/type_down_list_item.xml
index a0476f60..73cada3c 100644
--- a/res/layout/type_down_list_item.xml
+++ b/res/layout/type_down_list_item.xml
@@ -39,6 +39,7 @@
         android:id="@+id/phone_number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:theme="@style/Theme.Dialer.BidiText"
         android:singleLine="true"
         app:layout_constraintTop_toBottomOf="@id/contact_name"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/res/layout/user_profile_large.xml b/res/layout/user_profile_large.xml
index 6b74b076..0fe453d7 100644
--- a/res/layout/user_profile_large.xml
+++ b/res/layout/user_profile_large.xml
@@ -31,6 +31,7 @@ limitations under the License.
         android:paddingStart="@dimen/in_call_margin_between_avatar_and_text">
         <TextView
             android:id="@+id/user_profile_title"
+            android:theme="@style/Theme.Dialer.BidiText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="@style/TextAppearance.InCallUserTitle"
@@ -39,6 +40,7 @@ limitations under the License.
             android:id="@+id/user_profile_phone_number"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:theme="@style/Theme.Dialer.BidiText"
             android:textAppearance="@style/TextAppearance.InCallUserPhoneNumber"
             android:singleLine="true"
             android:layout_marginTop="@dimen/in_call_phone_number_margin_top"/>
diff --git a/res/layout/user_profile_list_item.xml b/res/layout/user_profile_list_item.xml
index d9fbeaf3..b3e2462c 100644
--- a/res/layout/user_profile_list_item.xml
+++ b/res/layout/user_profile_list_item.xml
@@ -31,6 +31,7 @@
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
+        android:theme="@style/Theme.Dialer.BidiText"
         android:orientation="vertical"
         android:paddingStart="@dimen/in_call_margin_between_avatar_and_text">
         <TextView
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index f0207ccd..84f20480 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -59,8 +59,8 @@
     <string name="phone_favorites" msgid="2257447553252980575">"پسندیدگیاں"</string>
     <string name="local_favorites" msgid="4954852813126882412">"مقامی پسندیدگیاں"</string>
     <string name="no_phone_numbers" msgid="8738691115921148445">"کوئی فون نمبر نہیں ہے"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"موصول ہونے والی کال کی اطلاع"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"موصول ہونے والی کال"</string>
+    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"اِن کمنگ کال کی اطلاع"</string>
+    <string name="notification_incoming_call" msgid="1722904631804432389">"اِن کمنگ کال"</string>
     <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"چھوٹی ہوئی کال کی اطلاع"</string>
     <plurals name="notification_missed_call" formatted="false" msgid="1018870358427938752">
       <item quantity="other">چھوٹی ہوئی کالز(<xliff:g id="NUMBER">%1$d</xliff:g>) </item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1ae011a7..3638b146 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -21,6 +21,11 @@ limitations under the License.
         <item name="android:textDirection">locale</item>
     </style>
 
+    <style name="Theme.Dialer.BidiText" parent="Theme.Dialer">
+        <item name="android:textDirection">ltr</item>
+        <item name="android:textAlignment">viewStart</item>
+    </style>
+
     <style name="Theme.Dialer.Telecom">
         <item name="toolbarTitleMode">@integer/config_toolbar_title_mode</item>
     </style>