From 5a60cf4d91cbe439a0372f4f2374e6a7f7936a41 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Wed, 30 Apr 2014 17:00:00 -0700
Subject: Fix font scaling problems in Dialpad

Change-Id: I49ae1763782529ad3ada03bb92b843b5608c3139
---
 res/values/dimens.xml                               | 2 +-
 src/com/android/dialer/dialpad/DialpadFragment.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 66b36a773..c7972af05 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -50,7 +50,7 @@
     <dimen name="dialpad_key_star_pound_size">26sp</dimen>
     <dimen name="dialpad_key_numbers_width">30dp</dimen>
     <dimen name="dialpad_key_letters_width">50dp</dimen>
-    <dimen name="dialpad_key_height">56dp</dimen>
+    <dimen name="dialpad_key_height">56sp</dimen>
     <!-- The bottom row of the dialpad is slightly taller to account for the dial button -->
     <dimen name="dialpad_bottom_key_height">70dp</dimen>
     <dimen name="dialpad_key_plus_size">18sp</dimen>
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 72abaa085..0ca26e99b 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -405,6 +405,7 @@ public class DialpadFragment extends Fragment
         mDigits.setOnKeyListener(this);
         mDigits.setOnLongClickListener(this);
         mDigits.addTextChangedListener(this);
+        mDigits.setElegantTextHeight(false);
         PhoneNumberFormatter.setPhoneNumberFormattingTextWatcher(getActivity(), mDigits);
         // Check for the presence of the keypad
         View oneButton = fragmentView.findViewById(R.id.one);
@@ -624,6 +625,7 @@ public class DialpadFragment extends Fragment
             lettersView = (TextView) dialpadKey.findViewById(R.id.dialpad_key_letters);
             final String numberString = resources.getString(numberIds[i]);
             numberView.setText(numberString);
+            numberView.setElegantTextHeight(false);
             dialpadKey.setContentDescription(numberString);
             if (lettersView != null) {
                 lettersView.setText(resources.getString(letterIds[i]));
-- 
cgit v1.2.3