Matching landscape Dialpad keys to mocks.

Landscape dialpad now matches mock. Subscript letters
now appear to the right of each number.

Bug: 15386162
Change-Id: Ic1d2ac91394c89c359b7bb665fa2bd51fef83cf7

2 files changed, 43 insertions, 26 deletions

diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index 6c794a45..90cbe184 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -28,31 +28,7 @@
         android:layout_weight="1"
         android:orientation="horizontal">
         <Space style="@style/DialpadSpaceStyle" />
-        <com.android.contacts.common.dialpad.DialpadKeyButton
-            android:id="@+id/one"
-            style="@style/DialpadKeyButtonStyle">
-            <LinearLayout
-                style="@style/DialpadKeyInternalLayoutStyle">
-                <com.android.contacts.common.dialpad.DialpadTextView
-                    android:id="@+id/dialpad_key_number"
-                    style="@style/DialpadKeyNumberStyle" />
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" >
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
-                        android:id="@+id/dialpad_key_voicemail"
-                        android:src="@drawable/ic_dialpad_vm"
-                        android:scaleType="fitCenter"
-                        android:layout_centerInParent="true"
-                        android:tint="@color/dialpad_secondary_text_color" />
-                    <!-- Place empty text view so vertical height is same as other dialpad keys. -->
-                    <TextView style="@style/DialpadKeyLettersStyle" />
-                </RelativeLayout>
-            </LinearLayout>
-        </com.android.contacts.common.dialpad.DialpadKeyButton>
+        <include layout="@layout/dialpad_key_one" />
         <include layout="@layout/dialpad_key"
             android:id="@+id/two"
             style="@style/DialpadKeyButtonStyle" />
@@ -110,7 +86,7 @@
             <LinearLayout
                 style="@style/DialpadKeyInternalLayoutStyle">
                 <com.android.contacts.common.dialpad.DialpadTextView
-                    android:id="@id/dialpad_key_number"
+                    android:id="@+id/dialpad_key_number"
                     style="@style/DialpadKeyStarStyle" />
             </LinearLayout>
         </com.android.contacts.common.dialpad.DialpadKeyButton>
diff --git a/res/layout/dialpad_key_one.xml b/res/layout/dialpad_key_one.xml
new file mode 100644
index 00000000..2365e6ef
--- /dev/null
+++ b/res/layout/dialpad_key_one.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 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.
+-->
+<com.android.contacts.common.dialpad.DialpadKeyButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/one"
+    style="@style/DialpadKeyButtonStyle">
+    <LinearLayout
+        style="@style/DialpadKeyInternalLayoutStyle">
+        <com.android.contacts.common.dialpad.DialpadTextView
+            android:id="@+id/dialpad_key_number"
+            style="@style/DialpadKeyNumberStyle" />
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
+                android:id="@+id/dialpad_key_voicemail"
+                android:src="@drawable/ic_dialpad_vm"
+                android:scaleType="fitCenter"
+                android:layout_centerInParent="true"
+                android:tint="@color/dialpad_secondary_text_color" />
+            <!-- Place empty text view so vertical height is same as other dialpad keys. -->
+            <TextView style="@style/DialpadKeyLettersStyle" />
+        </RelativeLayout>
+    </LinearLayout>
+</com.android.contacts.common.dialpad.DialpadKeyButton>