Merge "Enable RTL layout for Dialer" into qt-qpr1-dev

5 files changed, 35 insertions, 32 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ad0bba2..99cf3888 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -39,7 +39,8 @@
         android:name=".DialerApplication"
         android:directBootAware="true"
         android:label="@string/phone_app_name"
-        android:icon="@drawable/ic_app_icon">
+        android:icon="@drawable/ic_app_icon"
+        android:supportsRtl="true">
 
         <activity android:name=".ui.TelecomActivity"
                   android:launchMode="singleTask"
diff --git a/res/drawable/ic_arrow_right.xml b/res/drawable/ic_arrow_right.xml
index 051b6a05..877c510f 100644
--- a/res/drawable/ic_arrow_right.xml
+++ b/res/drawable/ic_arrow_right.xml
@@ -18,7 +18,8 @@ limitations under the License.
         android:viewportHeight="48"
         android:width="@dimen/primary_icon_size"
         android:height="@dimen/primary_icon_size"
-        android:tint="@color/icon_tint_state_list">
+        android:tint="@color/icon_tint_state_list"
+        android:autoMirrored="true">
 
     <path android:pathData="M0-.25h48v48H0z"/>
     <path
diff --git a/res/layout/dialpad_info.xml b/res/layout/dialpad_info.xml
index 78a12684..4219ba92 100644
--- a/res/layout/dialpad_info.xml
+++ b/res/layout/dialpad_info.xml
@@ -38,19 +38,19 @@
         android:autoSizeMaxTextSize="@dimen/dialpad_info_title_text_size_max"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="@id/dialpad_info_guideline"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/delete_button"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/delete_button"/>
 
     <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"
+        android:layout_marginLeft="@dimen/dialpad_info_title_padding_size"
+        android:layout_marginRight="@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"/>
+        app:layout_constraintLeft_toRightOf="@id/title"
+        app:layout_constraintRight_toRightOf="parent"/>
 
     <ImageView
         android:id="@+id/call_button"
diff --git a/res/layout/keypad.xml b/res/layout/keypad.xml
index a63b5ae3..7d8d47ca 100644
--- a/res/layout/keypad.xml
+++ b/res/layout/keypad.xml
@@ -30,8 +30,8 @@ limitations under the License.
         app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/four"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/two"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/two"/>
 
     <com.android.car.dialer.ui.dialpad.KeypadButton
         android:id="@+id/two"
@@ -41,8 +41,8 @@ limitations under the License.
         app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/five"
-        app:layout_constraintStart_toEndOf="@id/one"
-        app:layout_constraintEnd_toStartOf="@+id/three"/>
+        app:layout_constraintLeft_toRightOf="@id/one"
+        app:layout_constraintRight_toLeftOf="@+id/three"/>
 
     <com.android.car.dialer.ui.dialpad.KeypadButton
         android:id="@+id/three"
@@ -52,8 +52,8 @@ limitations under the License.
         app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/six"
-        app:layout_constraintStart_toEndOf="@id/two"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintLeft_toRightOf="@id/two"
+        app:layout_constraintRight_toRightOf="parent"/>
 
     <!-- Row 2 -->
     <com.android.car.dialer.ui.dialpad.KeypadButton
@@ -64,8 +64,8 @@ limitations under the License.
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintTop_toBottomOf="@id/one"
         app:layout_constraintBottom_toTopOf="@+id/seven"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/five"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/five"/>
 
     <com.android.car.dialer.ui.dialpad.KeypadButton
         android:id="@+id/five"
@@ -74,8 +74,8 @@ limitations under the License.
         style="@style/KeypadButtonStyle"
         app:layout_constraintTop_toBottomOf="@id/two"
         app:layout_constraintBottom_toTopOf="@+id/eight"
-        app:layout_constraintStart_toEndOf="@id/four"
-        app:layout_constraintEnd_toStartOf="@+id/six"/>
+        app:layout_constraintLeft_toRightOf="@id/four"
+        app:layout_constraintRight_toLeftOf="@+id/six"/>
 
     <com.android.car.dialer.ui.dialpad.KeypadButton
         android:id="@+id/six"
@@ -84,8 +84,8 @@ limitations under the License.
         style="@style/KeypadButtonStyle"
         app:layout_constraintTop_toBottomOf="@id/three"
         app:layout_constraintBottom_toTopOf="@+id/nine"
-        app:layout_constraintStart_toEndOf="@id/five"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintLeft_toRightOf="@id/five"
+        app:layout_constraintRight_toRightOf="parent"/>
 
 
     <!-- Row 3 -->
@@ -97,8 +97,8 @@ limitations under the License.
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintTop_toBottomOf="@id/four"
         app:layout_constraintBottom_toTopOf="@+id/star"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/eight"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/eight"/>
 
     <com.android.car.dialer.ui.dialpad.KeypadButton
         android:id="@+id/eight"
@@ -107,8 +107,8 @@ limitations under the License.
         style="@style/KeypadButtonStyle"
         app:layout_constraintTop_toBottomOf="@id/five"
         app:layout_constraintBottom_toTopOf="@+id/zero"
-        app:layout_constraintStart_toEndOf="@id/seven"
-        app:layout_constraintEnd_toStartOf="@+id/nine"/>
+        app:layout_constraintLeft_toRightOf="@id/seven"
+        app:layout_constraintRight_toLeftOf="@+id/nine"/>
 
     <com.android.car.dialer.ui.dialpad.KeypadButton
         android:id="@+id/nine"
@@ -117,8 +117,8 @@ limitations under the License.
         style="@style/KeypadButtonStyle"
         app:layout_constraintTop_toBottomOf="@id/six"
         app:layout_constraintBottom_toTopOf="@+id/pound"
-        app:layout_constraintStart_toEndOf="@id/eight"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintLeft_toRightOf="@id/eight"
+        app:layout_constraintRight_toRightOf="parent"/>
 
     <!-- Row 4 -->
     <com.android.car.dialer.ui.dialpad.KeypadButton
@@ -129,8 +129,8 @@ limitations under the License.
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintTop_toBottomOf="@id/seven"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/zero"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/zero"/>
 
     <com.android.car.dialer.ui.dialpad.KeypadButton
         android:id="@+id/zero"
@@ -139,8 +139,8 @@ limitations under the License.
         style="@style/KeypadButtonStyle"
         app:layout_constraintTop_toBottomOf="@id/eight"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/star"
-        app:layout_constraintEnd_toStartOf="@+id/pound"/>
+        app:layout_constraintLeft_toRightOf="@id/star"
+        app:layout_constraintRight_toLeftOf="@+id/pound"/>
 
     <com.android.car.dialer.ui.dialpad.KeypadButton
         android:id="@+id/pound"
@@ -149,8 +149,8 @@ limitations under the License.
         style="@style/KeypadButtonStyle"
         app:layout_constraintTop_toBottomOf="@id/nine"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/zero"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintLeft_toRightOf="@id/zero"
+        app:layout_constraintRight_toRightOf="parent"/>
 
     <include layout="@layout/keypad_dividers"/>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index bae1bc3d..11152f4b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -18,6 +18,7 @@ limitations under the License.
     <style name="Theme.Dialer" parent="Theme.CarUi">
         <item name="android:listDivider">@drawable/list_divider</item>
         <item name="android:buttonStyle">@style/Widget.Dialer.Button</item>
+        <item name="android:textDirection">locale</item>
     </style>
 
     <style name="Theme.Dialer.Telecom">