aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml10
-rw-r--r--java/res/xml/prefs.xml5
2 files changed, 12 insertions, 3 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 815c7fd28..64a4c9fc6 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -132,7 +132,15 @@
</declare-styleable>
<declare-styleable name="BaseKeyboard_Case">
- <attr name="mode" format="string" />
+ <!-- This should be matched with KeyboardSwitcher.MODE_* -->
+ <attr name="mode">
+ <flag name="text" value="0" />
+ <flag name="url" value="1" />
+ <flag name="email" value="2" />
+ <flag name="im" value="3" />
+ <flag name="web" value="4" />
+ <flag name="phone" value="5" />
+ </attr>
<attr name="settingsKey" format="string" />
<attr name="voiceKey" format="string" />
</declare-styleable>
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index d3ac0da60..85612b049 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -70,12 +70,13 @@
android:defaultValue="@string/voice_mode_main"
/>
-
+ <!-- TODO: Filter subtypes by IME in SubtypeEnabler -->
+ <!-- TODO: Maybe use this only for phone? -->
<PreferenceScreen
android:title="@string/language_selection_title"
android:summary="@string/language_selection_summary">
<intent
- android:action="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/>
+ android:action="android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER"/>
</PreferenceScreen>
<PreferenceCategory