From 8a29e95de37fc2a871f34e98fae5a83713277ff2 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Fri, 27 Oct 2017 13:21:38 -0700
Subject: Center align numbers in each column of the dialpad when in landscape
 mode.

No changes are made to the portrait-mode UI.

Bug: 30215380
Test: Manual
PiperOrigin-RevId: 173710022
Change-Id: I9ef8a57b044e069af2eb886ea6baa30c279f4f70
---
 .../res/layout-land/dialpad_key_zero.xml           | 41 +++++++++++-----------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_zero.xml')

diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_zero.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_zero.xml
index d885ddf05..4c46447d4 100644
--- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_zero.xml
+++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_zero.xml
@@ -14,31 +14,30 @@
      limitations under the License.
 -->
 
-<!-- A layout representing the zero key in the dialpad, with the plus sign shifted up because it is
-     smaller than a regular letter -->
+<!-- A layout representing key "0" in the dialpad -->
 <com.android.dialer.dialpadview.DialpadKeyButton
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/zero"
-  style="@style/DialpadKeyButtonStyle">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/zero"
+    style="@style/DialpadKeyButtonStyle">
 
   <LinearLayout
-    style="@style/DialpadKeyInternalLayoutStyle"
-    android:layout_gravity="right|center_vertical"
-    android:baselineAligned="false"
-    android:orientation="horizontal">
-
-    <!-- Note in the referenced styles that we assign hard widths to these components
-         because we want them to line up vertically when we arrange them in an MxN grid -->
-
-    <com.android.dialer.dialpadview.DialpadTextView
-      android:id="@+id/dialpad_key_number"
-      style="@style/DialpadBottomKeyNumberStyle"
-      android:layout_marginBottom="0dp"
-      android:layout_marginRight="@dimen/dialpad_key_margin_right"/>
+      style="@style/DialpadKeyInternalLayoutStyle"
+      android:layout_gravity="right|center_vertical"
+      android:baselineAligned="false"
+      android:orientation="horizontal">
+
+    <FrameLayout
+        android:layout_width="@dimen/dialpad_key_number_width"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/dialpad_key_margin_right">
+      <com.android.dialer.dialpadview.DialpadTextView
+          android:id="@+id/dialpad_key_number"
+          style="@style/DialpadBottomKeyNumberStyle"/>
+    </FrameLayout>
 
     <TextView
-      android:id="@+id/dialpad_key_letters"
-      style="@style/DialpadKeyLettersStyle"
-      android:layout_width="@dimen/dialpad_key_text_width"/>
+        android:id="@+id/dialpad_key_letters"
+        style="@style/DialpadKeyLettersStyle"
+        android:layout_width="@dimen/dialpad_key_text_width"/>
   </LinearLayout>
 </com.android.dialer.dialpadview.DialpadKeyButton>
-- 
cgit v1.2.3