aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-05-23 16:44:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-23 16:44:53 +0000
commit99ee123c7123c5c9df9e3ca30443092f9a0af5ad (patch)
treea4830b046c7b70d93fee8d959518746764207a50 /java/res
parent3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c (diff)
parent7a76350b7b7c500d12d0f1e8e15fd2ea8b4d3035 (diff)
downloadlatinime-99ee123c7123c5c9df9e3ca30443092f9a0af5ad.tar.gz
latinime-99ee123c7123c5c9df9e3ca30443092f9a0af5ad.tar.xz
latinime-99ee123c7123c5c9df9e3ca30443092f9a0af5ad.zip
am 7a76350b: Merge "Enable "show language switch key" settings on K and before"
* commit '7a76350b7b7c500d12d0f1e8e15fd2ea8b4d3035': Enable "show language switch key" settings on K and before
Diffstat (limited to 'java/res')
-rw-r--r--java/res/xml/prefs.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 61ebb6992..a62986228 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -153,6 +153,7 @@
android:defaultValue="true" />
<CheckBoxPreference
android:key="pref_include_other_imes_in_language_switch_list"
+ android:dependency="pref_show_language_switch_key"
android:title="@string/include_other_imes_in_language_switch_list"
android:summary="@string/include_other_imes_in_language_switch_list_summary"
android:persistent="true"