nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 6b9677d8: Merge "Small fix to KeyboardView" into jb-mr1-dev 

* commit '6b9677d84ba199780b0e8282bf89b04cb618f868':
  Small fix to KeyboardView
main
Tadashi G. Takaoka 2012-07-30 01:53:29 -07:00 committed by Android Git Automerger
parent 98a45f8e5c 6b9677d84b
commit 213ff17429
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View File

@ -255,10 +255,12 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
} }
public void updateKeyHeight(int keyHeight) { public void updateKeyHeight(int keyHeight) {
if (mKeyLetterRatio >= 0.0f) if (mKeyLetterRatio >= 0.0f) {
mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio); mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
if (mKeyLabelRatio >= 0.0f) }
if (mKeyLabelRatio >= 0.0f) {
mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio); mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio);
}
mKeyLargeLabelSize = (int)(keyHeight * mKeyLargeLabelRatio); mKeyLargeLabelSize = (int)(keyHeight * mKeyLargeLabelRatio);
mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio); mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);
mKeyHintLetterSize = (int)(keyHeight * mKeyHintLetterRatio); mKeyHintLetterSize = (int)(keyHeight * mKeyHintLetterRatio);
@ -340,13 +342,16 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
} }
public void updateKeyHeight(int keyHeight) { public void updateKeyHeight(int keyHeight) {
mPreviewTextSize = (int)(keyHeight * mPreviewTextRatio); if (mPreviewTextRatio >= 0.0f) {
mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio); mPreviewTextSize = (int)(keyHeight * mPreviewTextRatio);
}
if (mKeyLetterRatio >= 0.0f) {
mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
}
} }
private static void setAlpha(Drawable drawable, int alpha) { private static void setAlpha(Drawable drawable, int alpha) {
if (drawable == null) if (drawable == null) return;
return;
drawable.setAlpha(alpha); drawable.setAlpha(alpha);
} }
} }