commit 6b9677d84ba199780b0e8282bf89b04cb618f868
author Tadashi G. Takaoka <takaoka@google.com> Mon Jul 30 01:48:58 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 30 01:48:59 2012 -0700
tree e173b321383b21237d819c1eb370c711d2184e55
parent b9770cb7f7b6d51b651a60d753949208a9742974
parent edf7990e84bd05adefd1d9585dc1b3baf223cdd6

Merge "Small fix to KeyboardView" into jb-mr1-dev

java/src/com/android/inputmethod/keyboard/KeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index e70c7a1..6dc13d2 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -255,10 +255,12 @@
         }
 
         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 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);
         }
     }