diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-08-28 01:45:41 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-28 01:45:41 -0700 |
| commit | 701cb39bd0e125a721f213dbf3fca508a1b8d039 (patch) | |
| tree | b947734140d8ad602f4b5131976e9ce5c67d081f /java/res | |
| parent | 5ae1d3593e72f49c710c7cf69132a898b5f9bd90 (diff) | |
| parent | 2133ca2759fcd89bbc7292757c17dfd3db760c1a (diff) | |
| download | latinime-701cb39bd0e125a721f213dbf3fca508a1b8d039.tar.gz latinime-701cb39bd0e125a721f213dbf3fca508a1b8d039.tar.xz latinime-701cb39bd0e125a721f213dbf3fca508a1b8d039.zip | |
am 2133ca27: am 9fa0736d: Consolidate KeyboardView.keyLetterSize and keyLetterRatio
* commit '2133ca2759fcd89bbc7292757c17dfd3db760c1a':
Consolidate KeyboardView.keyLetterSize and keyLetterRatio
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 30 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 4 |
2 files changed, 16 insertions, 18 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index de732fb63..76e76cc82 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -41,26 +41,24 @@ checkable+checked+pressed. --> <attr name="keyBackground" format="reference" /> - <!-- Size of the text for one letter keys. If not defined, keyLetterRatio takes effect. --> - <attr name="keyLetterSize" format="dimension" /> - <!-- Size of the text for keys with multiple letters. If not defined, keyLabelRatio takes - effect. --> - <attr name="keyLabelSize" format="dimension" /> - <!-- Size of the text for one letter keys, in the proportion of key height. --> - <attr name="keyLetterRatio" format="float" /> + <!-- Size of the text for one letter keys. If specified as fraction, the text size is + measured in the proportion of key height. --> + <attr name="keyLetterSize" format="dimension|fraction" /> + <!-- Size of the text for keys with multiple letters. If specified as fraction, the text + size is measured in the proportion of key height. --> + <attr name="keyLabelSize" format="dimension|fraction" /> <!-- Large size of the text for one letter keys, in the proportion of key height. --> - <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" /> + <attr name="keyLargeLetterRatio" format="fraction" /> <!-- Large size of the text for keys with multiple letters, in the proportion of key height. --> - <attr name="keyLargeLabelRatio" format="float" /> + <attr name="keyLargeLabelRatio" format="fraction" /> <!-- Size of the text for hint letter (= one character hint label), in the proportion of key height. --> - <attr name="keyHintLetterRatio" format="float" /> + <attr name="keyHintLetterRatio" format="fraction" /> <!-- Size of the text for hint label, in the proportion of key height. --> - <attr name="keyHintLabelRatio" format="float" /> + <attr name="keyHintLabelRatio" format="fraction" /> <!-- Size of the text for shifted letter hint, in the proportion of key height. --> - <attr name="keyShiftedLetterHintRatio" format="float" /> + <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.--> @@ -96,8 +94,8 @@ <attr name="keyPreviewOffset" format="dimension" /> <!-- Height of the key press feedback popup. --> <attr name="keyPreviewHeight" format="dimension" /> - <!-- Size of the text for key press feedback popup, int the proportion of key height --> - <attr name="keyPreviewTextRatio" format="float" /> + <!-- Size of the text for key press feedback popup, in the proportion of key height. --> + <attr name="keyPreviewTextRatio" format="fraction" /> <!-- Delay after key releasing and key press feedback dismissing in millisecond --> <attr name="keyPreviewLingerTimeout" format="integer" /> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index ccf378a69..0220c836e 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -35,9 +35,9 @@ <style name="KeyboardView"> <item name="android:background">@drawable/keyboard_background</item> <item name="keyBackground">@drawable/btn_keyboard_key</item> - <item name="keyLetterRatio">@fraction/key_letter_ratio</item> + <item name="keyLetterSize">@fraction/key_letter_ratio</item> <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item> - <item name="keyLabelRatio">@fraction/key_label_ratio</item> + <item name="keyLabelSize">@fraction/key_label_ratio</item> <item name="keyLargeLabelRatio">@fraction/key_large_label_ratio</item> <item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item> <item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item> |