diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-23 16:44:53 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 16:44:53 +0000 |
| commit | 99ee123c7123c5c9df9e3ca30443092f9a0af5ad (patch) | |
| tree | a4830b046c7b70d93fee8d959518746764207a50 /java/src/com/android/inputmethod/latin/settings/Settings.java | |
| parent | 3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c (diff) | |
| parent | 7a76350b7b7c500d12d0f1e8e15fd2ea8b4d3035 (diff) | |
| download | latinime-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/src/com/android/inputmethod/latin/settings/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/Settings.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java index d4f6bcd10..48219f60a 100644 --- a/java/src/com/android/inputmethod/latin/settings/Settings.java +++ b/java/src/com/android/inputmethod/latin/settings/Settings.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.res.Resources; +import android.os.Build; import android.preference.PreferenceManager; import android.util.Log; @@ -60,6 +61,10 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang "pref_key_use_double_space_period"; public static final String PREF_BLOCK_POTENTIALLY_OFFENSIVE = "pref_key_block_potentially_offensive"; + public static final boolean ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS = + (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) + || (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT + && Build.VERSION.CODENAME.equals("REL")); public static final String PREF_SHOW_LANGUAGE_SWITCH_KEY = "pref_show_language_switch_key"; public static final String PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST = |