diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-17 18:34:38 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-17 18:34:38 -0700 |
| commit | db8b3a1ecf06fe7c824591fcd598c386ae0e36c7 (patch) | |
| tree | 3676cebab906255f2b5cf8293f1f22179bea53f4 /java/res | |
| parent | da3ba3e2549cc69c360fede58b7e170d92e67b0a (diff) | |
| parent | 817a66e7e6bc9eb0bc74bacf0431308f40185cb1 (diff) | |
| download | latinime-db8b3a1ecf06fe7c824591fcd598c386ae0e36c7.tar.gz latinime-db8b3a1ecf06fe7c824591fcd598c386ae0e36c7.tar.xz latinime-db8b3a1ecf06fe7c824591fcd598c386ae0e36c7.zip | |
am 817a66e7: Merge "Support large label text ratio in KeyboardView" into jb-dev
* commit '817a66e7e6bc9eb0bc74bacf0431308f40185cb1':
Support large label text ratio in KeyboardView
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 7cad3f507..a18371fc9 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -55,6 +55,8 @@ <attr name="keyLargeLetterRatio" format="float" /> <!-- Size of the text for keys with multiple letters, in the proportion of key height. --> <attr name="keyLabelRatio" format="float" /> + <!-- Large size of the text for keys with multiple letters, in the proportion of key height. --> + <attr name="keyLargeLabelRatio" format="float" /> <!-- Size of the text for hint letter (= one character hint label), in the proportion of key height. --> <attr name="keyHintLetterRatio" format="float" /> @@ -275,7 +277,8 @@ <flag name="followKeyLargeLetterRatio" value="0x40" /> <flag name="followKeyLetterRatio" value="0x80" /> <flag name="followKeyLabelRatio" value="0xC0" /> - <flag name="followKeyHintLabelRatio" value="0x100" /> + <flag name="followKeyLargeLabelRatio" value="0x100" /> + <flag name="followKeyHintLabelRatio" value="0x140" /> <flag name="hasPopupHint" value="0x200" /> <flag name="hasShiftedLetterHint" value="0x400" /> <flag name="hasHintLabel" value="0x800" /> |