aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-08-30 22:12:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-30 22:12:26 -0700
commita7b81435c569dc2ec34b9a5655d702720cb47d1c (patch)
treeea61dc38ff3876f8d70bb19a6be72d8c7bc66636 /java/res
parent92a2c9b64447ccbf2edcc55d89559ed3c251478c (diff)
parent71b52a84e2d078d0f57712dba88f8cc691412672 (diff)
downloadlatinime-a7b81435c569dc2ec34b9a5655d702720cb47d1c.tar.gz
latinime-a7b81435c569dc2ec34b9a5655d702720cb47d1c.tar.xz
latinime-a7b81435c569dc2ec34b9a5655d702720cb47d1c.zip
am 71b52a84: Move key label padding attributes back to KeyboardView
* commit '71b52a84e2d078d0f57712dba88f8cc691412672': Move key label padding attributes back to KeyboardView
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml19
1 files changed, 10 insertions, 9 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index a44f84b9c..b659763ea 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -41,6 +41,15 @@
checkable+checked+pressed. -->
<attr name="keyBackground" format="reference" />
+ <!-- Horizontal padding of left/right aligned key label to the edge of the key. -->
+ <attr name="keyLabelHorizontalPadding" format="dimension" />
+ <!-- Right padding of hint letter to the edge of the key.-->
+ <attr name="keyHintLetterPadding" format="dimension" />
+ <!-- Bottom padding of popup hint letter "..." to the edge of the key.-->
+ <attr name="keyPopupHintLetterPadding" format="dimension" />
+ <!-- Right padding of shifted letter hint to the edge of the key.-->
+ <attr name="keyShiftedLetterHintPadding" format="dimension" />
+
<!-- Layout resource for key press feedback.-->
<attr name="keyPreviewLayout" format="reference" />
<!-- The background for key press feedback. -->
@@ -307,15 +316,7 @@
<!-- Size of the text for hint label, in the proportion of key height. -->
<attr name="keyHintLabelRatio" format="fraction" />
<!-- Size of the text for shifted letter hint, in the proportion of key height. -->
- <attr name="keyShiftedLetterHintRatio" format="dimension|fraction" />
- <!-- Horizontal padding of left/right aligned key label to the edge of the key. -->
- <attr name="keyLabelHorizontalPadding" format="dimension" />
- <!-- Right padding of hint letter to the edge of the key.-->
- <attr name="keyHintLetterPadding" format="dimension" />
- <!-- Bottom padding of popup hint letter "..." to the edge of the key.-->
- <attr name="keyPopupHintLetterPadding" format="dimension" />
- <!-- Right padding of shifted letter hint to the edge of the key.-->
- <attr name="keyShiftedLetterHintPadding" format="dimension" />
+ <attr name="keyShiftedLetterHintRatio" format="fraction" />
<!-- Color to use for the label in a key. -->
<attr name="keyTextColor" format="color" />
<attr name="keyTextShadowColor" format="color" />