diff options
| author | Ken Wakasa <kwakasa@google.com> | 2014-08-07 11:37:11 +0000 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2014-08-07 11:37:11 +0000 |
| commit | 44e20f4fb42380061b1c4aa8905c2b301d7130cd (patch) | |
| tree | e35a29294bc5245ae2cb0e1874504ea83911e32d /java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java | |
| parent | cdcaa37a372799eecf796f7002bf49bf3a5f42c1 (diff) | |
Revert "Remove unused Key and Keyboard attributes"
This reverts commit cdcaa37a372799eecf796f7002bf49bf3a5f42c1.
Due to unit test breakage.
Change-Id: I1c22edf983f6e03a34b86d7c1fae3d3188447a75
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 72477ce62..07ac06bab 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; @@ -51,6 +52,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; @@ -82,6 +84,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, |