commit 11c3b487fb94290768e4290123b2711edcc5acac
author Yorke Lee <yorkelee@google.com> Mon Nov 04 11:23:54 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 04 11:23:54 2013 -0800
tree 8d824516ceb6d9dbe48dc804f18872ad8cbb17da
parent b911519f9f37c89b12333bd1c00752561e34fa93
parent f61b8bc69634a0ad7f7746eddc4bee71b2186be6

am f61b8bc6: Merge "Fix dialpad key alignment issues for larger screens" into klp-dev

* commit 'f61b8bc69634a0ad7f7746eddc4bee71b2186be6':
  Fix dialpad key alignment issues for larger screens

res/layout/dialpad.xml

diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index bc910db..4fc3e83 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -40,7 +40,7 @@
             android:focusable="true" >
             <LinearLayout
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center" >
                 <TextView
                     android:id="@+id/dialpad_key_number"

res/layout/dialpad_key.xml

diff --git a/res/layout/dialpad_key.xml b/res/layout/dialpad_key.xml
index e87fde0..c104f8a 100644
--- a/res/layout/dialpad_key.xml
+++ b/res/layout/dialpad_key.xml
@@ -22,7 +22,7 @@
     android:focusable="true" >
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="center">
       <TextView
           android:id="@+id/dialpad_key_number"