1 files changed, 19 insertions, 20 deletions
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key.xml
index 941fdb2ec..b126f723f 100644
--- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key.xml
+++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key.xml
@@ -16,29 +16,28 @@
 
 <!-- A layout representing a single key in the dialpad -->
 <com.android.dialer.dialpadview.DialpadKeyButton
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/DialpadKeyButtonStyle">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    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/DialpadKeyNumberStyle"
-      android:layout_marginBottom="0dp"
-      android:layout_marginRight="@dimen/dialpad_key_margin_right"
-      android:layout_gravity="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/DialpadKeyNumberStyle"/>
+    </FrameLayout>
 
     <TextView
-      android:id="@+id/dialpad_key_letters"
-      style="@style/DialpadKeyLettersStyle"
-      android:layout_width="@dimen/dialpad_key_text_width"
-      android:layout_gravity="right|center"/>
+        android:id="@+id/dialpad_key_letters"
+        style="@style/DialpadKeyLettersStyle"
+        android:layout_width="@dimen/dialpad_key_text_width"
+        android:layout_gravity="center"/>
   </LinearLayout>
 </com.android.dialer.dialpadview.DialpadKeyButton>