diff options
| author | Ken Wakasa <kwakasa@google.com> | 2014-08-07 11:37:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 00:03:09 +0000 |
| commit | 5f57fe4ad035f3deb53a58616efea843546266b4 (patch) | |
| tree | 44a7e75005099931d2ae286b9ab79968ddd24003 /java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java | |
| parent | 5218382141a0ea5dfd5a4323dd15da87f7f948d7 (diff) | |
| parent | 44e20f4fb42380061b1c4aa8905c2b301d7130cd (diff) | |
Merge "Revert "Remove unused Key and Keyboard attributes"" into lmp-dev
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java b/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java index df50efdc1..6dbee55ae 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java @@ -26,6 +26,7 @@ public final class KeyDrawParams { public int mLetterSize; public int mLabelSize; public int mLargeLetterSize; + public int mLargeLabelSize; public int mHintLetterSize; public int mShiftedLetterHintSize; public int mHintLabelSize; @@ -55,6 +56,7 @@ public final class KeyDrawParams { mLetterSize = copyFrom.mLetterSize; mLabelSize = copyFrom.mLabelSize; mLargeLetterSize = copyFrom.mLargeLetterSize; + mLargeLabelSize = copyFrom.mLargeLabelSize; mHintLetterSize = copyFrom.mHintLetterSize; mShiftedLetterHintSize = copyFrom.mShiftedLetterHintSize; mHintLabelSize = copyFrom.mHintLabelSize; @@ -90,6 +92,7 @@ public final class KeyDrawParams { attr.mLetterSize, attr.mLetterRatio, mLetterSize); mLabelSize = selectTextSizeFromDimensionOrRatio(keyHeight, attr.mLabelSize, attr.mLabelRatio, mLabelSize); + mLargeLabelSize = selectTextSize(keyHeight, attr.mLargeLabelRatio, mLargeLabelSize); mLargeLetterSize = selectTextSize(keyHeight, attr.mLargeLetterRatio, mLargeLetterSize); mHintLetterSize = selectTextSize(keyHeight, attr.mHintLetterRatio, mHintLetterSize); mShiftedLetterHintSize = selectTextSize(keyHeight, |