aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-05-21 12:43:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-21 12:43:40 -0700
commit15ba2f98196aa2e84c12e1f5a3569ad85cb2d6e7 (patch)
tree3d1e2acfcfda3cb49eaa32049ed5e0accaf7fe56 /java/res
parent9d0c15d9b4b635707a91f8750056a3ccd01be2d2 (diff)
parentdb8b3a1ecf06fe7c824591fcd598c386ae0e36c7 (diff)
downloadlatinime-15ba2f98196aa2e84c12e1f5a3569ad85cb2d6e7.tar.gz
latinime-15ba2f98196aa2e84c12e1f5a3569ad85cb2d6e7.tar.xz
latinime-15ba2f98196aa2e84c12e1f5a3569ad85cb2d6e7.zip
am db8b3a1e: am 817a66e7: Merge "Support large label text ratio in KeyboardView" into jb-dev
* commit 'db8b3a1ecf06fe7c824591fcd598c386ae0e36c7': Support large label text ratio in KeyboardView
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml5
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" />