From e403700972f0c3187382c35e9b037b9a4907cf52 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Thu, 23 Jul 2009 17:38:15 -0700 Subject: Fix #1977876 : Key preview in WVGA broken. Use PX unit when setting the text size since we're getting the size from getTextSize() Reduce delay for popup. --- core/java/android/inputmethodservice/KeyboardView.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/java/android/inputmethodservice/KeyboardView.java b/core/java/android/inputmethodservice/KeyboardView.java index 7830cb74e301..4d6b7be9daed 100755 --- a/core/java/android/inputmethodservice/KeyboardView.java +++ b/core/java/android/inputmethodservice/KeyboardView.java @@ -31,6 +31,7 @@ import android.inputmethodservice.Keyboard.Key; import android.os.Handler; import android.os.Message; import android.util.AttributeSet; +import android.util.TypedValue; import android.view.GestureDetector; import android.view.Gravity; import android.view.LayoutInflater; @@ -161,8 +162,8 @@ public class KeyboardView extends View implements View.OnClickListener { private static final int MSG_REMOVE_PREVIEW = 2; private static final int MSG_REPEAT = 3; private static final int MSG_LONGPRESS = 4; - - private static final int DELAY_BEFORE_PREVIEW = 70; + + private static final int DELAY_BEFORE_PREVIEW = 40; private static final int DELAY_AFTER_PREVIEW = 60; private int mVerticalCorrection; @@ -827,10 +828,10 @@ public class KeyboardView extends View implements View.OnClickListener { mPreviewText.setCompoundDrawables(null, null, null, null); mPreviewText.setText(getPreviewText(key)); if (key.label.length() > 1 && key.codes.length < 2) { - mPreviewText.setTextSize(mKeyTextSize); + mPreviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mKeyTextSize); mPreviewText.setTypeface(Typeface.DEFAULT_BOLD); } else { - mPreviewText.setTextSize(mPreviewTextSizeLarge); + mPreviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mPreviewTextSizeLarge); mPreviewText.setTypeface(Typeface.DEFAULT); } } -- cgit v1.2.3-59-g8ed1b