aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values-cs/strings.xml2
-rw-r--r--java/res/values-da/strings.xml2
-rw-r--r--java/res/values-de/strings.xml2
-rw-r--r--java/res/values-el/strings.xml2
-rw-r--r--java/res/values-es-rUS/strings.xml2
-rw-r--r--java/res/values-es/strings.xml2
-rw-r--r--java/res/values-fr/strings.xml2
-rw-r--r--java/res/values-it/strings.xml2
-rw-r--r--java/res/values-ja/strings.xml2
-rw-r--r--java/res/values-ko/strings.xml2
-rw-r--r--java/res/values-nb/strings.xml2
-rw-r--r--java/res/values-nl/strings.xml2
-rw-r--r--java/res/values-pl/strings.xml2
-rw-r--r--java/res/values-pt-rPT/strings.xml2
-rw-r--r--java/res/values-pt/strings.xml2
-rw-r--r--java/res/values-rm/strings.xml4
-rw-r--r--java/res/values-ru/strings.xml2
-rw-r--r--java/res/values-sv/strings.xml2
-rw-r--r--java/res/values-tr/strings.xml2
-rw-r--r--java/res/values-xlarge/bools.xml23
-rw-r--r--java/res/values-xlarge/dimens.xml26
-rw-r--r--java/res/values-zh-rCN/strings.xml2
-rw-r--r--java/res/values-zh-rTW/strings.xml2
-rw-r--r--java/res/values/strings.xml2
-rw-r--r--java/res/xml/method.xml111
-rw-r--r--java/res/xml/prefs.xml9
26 files changed, 171 insertions, 44 deletions
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index d6bb40233..5ec1ded0b 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index 8028286bb..8e9a6695a 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index f46b9b82f..e9c9b1b53 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 7cdd8278e..4a089d33f 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index 88185b557..413454be1 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index 70539414f..2064c34ea 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index 0c267aaff..ca6902741 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 0624ec478..8ee2b4f06 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index 8e6508c5f..fa7745a31 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index 6f9643c3d..05d6a87f6 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
index b74506227..13fab75aa 100644
--- a/java/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index 164a65b51..8f79b7e38 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
index 7c0252d93..ae384ba1a 100644
--- a/java/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
index 13871eebe..b10478cc2 100644
--- a/java/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index 7defaee85..754d79ed5 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml
index 066f72ab6..a93cd1f65 100644
--- a/java/res/values-rm/strings.xml
+++ b/java/res/values-rm/strings.xml
@@ -139,6 +139,8 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
+ <!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
+ <skip />
+ <!-- no translation found for subtype_mode_voice (4394113125441627771) -->
<skip />
</resources>
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index 0d3aed39f..b0ba83c88 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index d56c370b7..5a7761c33 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index 32f357f82..e1a399871 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-xlarge/bools.xml b/java/res/values-xlarge/bools.xml
new file mode 100644
index 000000000..fe8fc5838
--- /dev/null
+++ b/java/res/values-xlarge/bools.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <!-- Whether or not Popup on key press is enabled by default -->
+ <bool name="default_popup_preview">false</bool>
+</resources>
diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml
new file mode 100644
index 000000000..4e1c52877
--- /dev/null
+++ b/java/res/values-xlarge/dimens.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+ <dimen name="key_height">72dip</dimen>
+ <dimen name="candidate_strip_height">46dip</dimen>
+ <dimen name="spacebar_vertical_correction">0dip</dimen>
+ <dimen name="key_text_size">35sp</dimen>
+</resources>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index 373cee4ae..c461303cc 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index 77c41e832..a5eb4c6d1 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -137,8 +137,6 @@
<skip />
<!-- no translation found for keyboard_layout (437433231038683666) -->
<skip />
- <!-- no translation found for prefs_debug_mode (3889340783846594980) -->
- <skip />
<!-- no translation found for subtype_mode_keyboard (2242090416595003881) -->
<skip />
<!-- no translation found for subtype_mode_voice (4394113125441627771) -->
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 3df32e47f..c1ec8eb9e 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -31,7 +31,7 @@
<!-- Option to play back sound on keypress in soft keyboard -->
<string name="sound_on_keypress">Sound on keypress</string>
- <!-- Option to pop up the character with a larger font above soft keyboard -->
+ <!-- Option to control whether or not to show a popup with a larger font on each key press. -->
<string name="popup_on_keypress">Popup on keypress</string>
<!-- Option to enable using nearby keys when correcting/predicting -->
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index e5654e96d..fab4bd72b 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,7 +20,114 @@
<!-- The attributes in this XML file provide configuration information -->
<!-- for the Input Method Manager. -->
+<!-- cs, da, de, en, es, fr, it, iw, nb, nl, ru, sr, sv -->
+<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
+<!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
<input-method xmlns:android="http://schemas.android.com/apk/res/android"
android:settingsActivity="com.android.inputmethod.latin.LatinIMESettings"
- android:isDefault="@bool/im_is_default"
-/>
+ android:isDefault="@bool/im_is_default">
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="cs"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="da"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="de"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="en"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="es"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="fr"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="it"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="iw"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="nb"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="nl"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="ru"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="sr"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:imeSubtypeLocale="sv"
+ android:imeSubtypeMode="@string/subtype_mode_keyboard"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="cs"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="da"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="de"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="en"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="es"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="fr"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="it"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="iw"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="nb"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="nl"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="ru"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="sr"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+ <subtype android:icon="@drawable/ic_subtype_mic"
+ android:imeSubtypeLocale="sv"
+ android:imeSubtypeMode="@string/subtype_mode_voice"
+ />
+</input-method>
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 762ada00c..a9ff8cabf 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -112,6 +112,15 @@
android:defaultValue="@bool/enable_autocorrect"
android:dependency="show_suggestions"
/>
+
+ <CheckBoxPreference
+ android:key="bigram_suggestion"
+ android:title="@string/bigram_suggestion"
+ android:summary="@string/bigram_suggestion_summary"
+ android:persistent="true"
+ android:defaultValue="true"
+ android:dependency="auto_complete"
+ />
</PreferenceCategory>
</PreferenceScreen>