aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-07-30 00:54:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-30 00:54:32 -0700
commit98a45f8e5c0cea8ff3e611539c511ff1cc410ba4 (patch)
tree7c7f21a5c52c481e6f42ea51b6f135079a2a395e /java/res
parent32851c3368d5c2f37a082a422fbc054e6844a00e (diff)
parentb9770cb7f7b6d51b651a60d753949208a9742974 (diff)
downloadlatinime-98a45f8e5c0cea8ff3e611539c511ff1cc410ba4.tar.gz
latinime-98a45f8e5c0cea8ff3e611539c511ff1cc410ba4.tar.xz
latinime-98a45f8e5c0cea8ff3e611539c511ff1cc410ba4.zip
am b9770cb7: Merge "Add device form factor to KeyboardId" into jb-mr1-dev
* commit 'b9770cb7f7b6d51b651a60d753949208a9742974': Add device form factor to KeyboardId
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values-sw600dp/config.xml2
-rw-r--r--java/res/values-sw768dp/config.xml2
-rw-r--r--java/res/values/config.xml2
3 files changed, 6 insertions, 0 deletions
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index 619169c52..e296623b2 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -19,6 +19,8 @@
-->
<resources>
+ <!-- Device form factor. This value must be aligned with {@link KeyboardId.DEVICE_FORM_FACTOR_TABLET7} -->
+ <integer name="config_device_form_factor">1</integer>
<bool name="config_enable_show_voice_key_option">false</bool>
<bool name="config_enable_show_popup_on_keypress_option">false</bool>
<bool name="config_enable_bigram_suggestions_option">false</bool>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index 27cb9ac21..346fa9979 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -19,6 +19,8 @@
-->
<resources>
+ <!-- Device form factor. This value must be aligned with {@link KeyboardId.DEVICE_FORM_FACTOR_TABLET10} -->
+ <integer name="config_device_form_factor">2</integer>
<bool name="config_enable_show_voice_key_option">false</bool>
<bool name="config_enable_show_popup_on_keypress_option">false</bool>
<bool name="config_enable_bigram_suggestions_option">false</bool>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 50f46c3f5..e5575e7ae 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -19,6 +19,8 @@
-->
<resources>
+ <!-- Device form factor. This value must be aligned with {@link KeyboardId.DEVICE_FORM_FACTOR_PHONE} -->
+ <integer name="config_device_form_factor">0</integer>
<bool name="config_use_fullscreen_mode">false</bool>
<bool name="config_enable_show_voice_key_option">true</bool>
<bool name="config_enable_show_popup_on_keypress_option">true</bool>