From edf7990e84bd05adefd1d9585dc1b3baf223cdd6 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 30 Jul 2012 16:50:03 +0900
Subject: [PATCH] Small fix to KeyboardView
Change-Id: Ifb7500ec2e55b50bb7951aa847fd4fbf49e32f4e
---
.../inputmethod/keyboard/KeyboardView.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 9c6543b61a..51cd375442 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -255,10 +255,12 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
}
public void updateKeyHeight(int keyHeight) {
- if (mKeyLetterRatio >= 0.0f)
+ if (mKeyLetterRatio >= 0.0f) {
mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
- if (mKeyLabelRatio >= 0.0f)
+ }
+ if (mKeyLabelRatio >= 0.0f) {
mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio);
+ }
mKeyLargeLabelSize = (int)(keyHeight * mKeyLargeLabelRatio);
mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);
mKeyHintLetterSize = (int)(keyHeight * mKeyHintLetterRatio);
@@ -340,13 +342,16 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
}
public void updateKeyHeight(int keyHeight) {
- mPreviewTextSize = (int)(keyHeight * mPreviewTextRatio);
- mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
+ if (mPreviewTextRatio >= 0.0f) {
+ mPreviewTextSize = (int)(keyHeight * mPreviewTextRatio);
+ }
+ if (mKeyLetterRatio >= 0.0f) {
+ mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
+ }
}
private static void setAlpha(Drawable drawable, int alpha) {
- if (drawable == null)
- return;
+ if (drawable == null) return;
drawable.setAlpha(alpha);
}
}
--
GitLab