Move key label padding attributes back to KeyboardView
This is a partially reverting change of I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394
Change-Id: Id213541cdddcc0761bf6418c8429a5f96c0281ef
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index a44f84b..b659763 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" />