commit 619f707c95113e87afc924ba884639f83a959dad
author Tadashi G. Takaoka <takaoka@google.com> Tue Aug 30 15:19:42 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Aug 30 15:19:42 2011 +0900
tree 718dccb0c196dfda79237acb300403e31b8bfc09
parent 3e63fbe400e9c0888c3829a5f641ffb2dec6379a

Fix another mismatched attribute in KeyboardView

This is a followup of Iea7f8f34.

Bug: 5023981
Change-Id: I1135383ff0f0a2b8a5940d0d5c407fd01706a7f7

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 d6b7ed0..5f82453 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -225,19 +225,17 @@
             mKeyBackground = a.getDrawable(R.styleable.KeyboardView_keyBackground);
             if (a.hasValue(R.styleable.KeyboardView_keyLetterSize)) {
                 mKeyLetterRatio = UNDEFINED_RATIO;
-                mKeyLetterSize = a.getDimensionPixelSize(
-                        R.styleable.KeyboardView_keyLetterRatio, 0);
+                mKeyLetterSize = a.getDimensionPixelSize(R.styleable.KeyboardView_keyLetterSize, 0);
             } else {
                 mKeyLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLetterRatio);
             }
-            mKeyLargeLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLargeLetterRatio);
             if (a.hasValue(R.styleable.KeyboardView_keyLabelSize)) {
                 mKeyLabelRatio = UNDEFINED_RATIO;
-                mKeyLabelSize = a.getDimensionPixelSize(
-                        R.styleable.KeyboardView_keyLabelRatio, 0);
+                mKeyLabelSize = a.getDimensionPixelSize(R.styleable.KeyboardView_keyLabelSize, 0);
             } else {
                 mKeyLabelRatio = getRatio(a, R.styleable.KeyboardView_keyLabelRatio);
             }
+            mKeyLargeLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLargeLetterRatio);
             mKeyHintLetterRatio = getRatio(a, R.styleable.KeyboardView_keyHintLetterRatio);
             mKeyUppercaseLetterRatio = getRatio(a,
                     R.styleable.KeyboardView_keyUppercaseLetterRatio);
@@ -268,9 +266,9 @@
         public void updateKeyHeight(int keyHeight) {
             if (mKeyLetterRatio >= 0.0f)
                 mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
-            mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);
             if (mKeyLabelRatio >= 0.0f)
                 mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio);
+            mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);
             mKeyHintLetterSize = (int)(keyHeight * mKeyHintLetterRatio);
             mKeyUppercaseLetterSize = (int)(keyHeight * mKeyUppercaseLetterRatio);
             mKeyHintLabelSize = (int)(keyHeight * mKeyHintLabelRatio);