aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-02-08 00:05:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-08 00:05:51 -0800
commitdd1bec7ae413dec353da340d83fe7eee18f7cce6 (patch)
tree3dc6c71dc9bdc8a59bfd109b7c015bb3483c6468 /java/res/xml
parent4df3dc98d4811c23f32d944123d25a42069b9c8c (diff)
parent614cb02a9183841ec8ea76615c879e1da439cc10 (diff)
downloadlatinime-dd1bec7ae413dec353da340d83fe7eee18f7cce6.tar.gz
latinime-dd1bec7ae413dec353da340d83fe7eee18f7cce6.tar.xz
latinime-dd1bec7ae413dec353da340d83fe7eee18f7cce6.zip
am 614cb02a: Merge "Rename mini keyboard to more keys keyboard"
* commit '614cb02a9183841ec8ea76615c879e1da439cc10': Rename mini keyboard to more keys keyboard
Diffstat (limited to 'java/res/xml')
-rw-r--r--java/res/xml/kbd_more_keys_keyboard_template.xml (renamed from java/res/xml/kbd_mini_keyboard_template.xml)2
-rw-r--r--java/res/xml/key_styles_common.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/res/xml/kbd_mini_keyboard_template.xml b/java/res/xml/kbd_more_keys_keyboard_template.xml
index ad6cf51fe..8e977c5ad 100644
--- a/java/res/xml/kbd_mini_keyboard_template.xml
+++ b/java/res/xml/kbd_more_keys_keyboard_template.xml
@@ -21,6 +21,6 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="10%p"
latin:rowHeight="@dimen/popup_key_height"
- style="?attr/miniKeyboardStyle"
+ style="?attr/moreKeysKeyboardStyle"
>
</Keyboard>
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index ab9bc4672..177a62c58 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -278,6 +278,6 @@
latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="@string/more_keys_for_punctuation"
- latin:maxMoreKeysColumn="@integer/mini_keyboard_column_for_punctuation"
+ latin:maxMoreKeysColumn="@integer/more_keys_keyboard_column_for_punctuation"
latin:backgroundType="functional" />
</merge>