Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE. Already in master. Fix #1977876 : Key preview in WVGA broken.

Browse Source 
Use PX unit when setting the text size since we're getting the size from getTextSize()
Reduce delay for popup.
This commit is contained in:
Amith Yamasani
2009-07-23 17:38:15 -07:00
parent 4ca6659fe4
commit 07ee3fdaea
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/inputmethodservice/KeyboardView.java
View File

@@ -32,6 +32,7 @@ import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; 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_REMOVE_PREVIEW = 2;
private static final int MSG_REPEAT = 3; private static final int MSG_REPEAT = 3;
private static final int MSG_LONGPRESS = 4; 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 static final int DELAY_AFTER_PREVIEW = 60;
private int mVerticalCorrection; private int mVerticalCorrection;
@@ -825,10 +826,10 @@ public class KeyboardView extends View implements View.OnClickListener {
mPreviewText.setCompoundDrawables(null, null, null, null); mPreviewText.setCompoundDrawables(null, null, null, null);
mPreviewText.setText(getPreviewText(key)); mPreviewText.setText(getPreviewText(key));
if (key.label.length() > 1 && key.codes.length < 2) { if (key.label.length() > 1 && key.codes.length < 2) {
mPreviewText.setTextSize(mKeyTextSize); mPreviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mKeyTextSize);
mPreviewText.setTypeface(Typeface.DEFAULT_BOLD); mPreviewText.setTypeface(Typeface.DEFAULT_BOLD);
} else { } else {
mPreviewText.setTextSize(mPreviewTextSizeLarge); mPreviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mPreviewTextSizeLarge);
mPreviewText.setTypeface(Typeface.DEFAULT); mPreviewText.setTypeface(Typeface.DEFAULT);
} }
} }