aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/settings/Settings.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-08-13 07:52:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-13 07:52:52 +0000
commit089371b649538dca728b48672b2a2563753ba365 (patch)
tree57d48eaeb5d6fa80f1ee95f44ac334e57f5f3c70 /java/src/com/android/inputmethod/latin/settings/Settings.java
parent18c562871f8ce9e6b26a7a348ab48aa7f055d4f2 (diff)
parentbdb05cc89f63f4f3956936fa062d0b4555aa072a (diff)
downloadlatinime-089371b649538dca728b48672b2a2563753ba365.tar.gz
latinime-089371b649538dca728b48672b2a2563753ba365.tar.xz
latinime-089371b649538dca728b48672b2a2563753ba365.zip
am bdb05cc8: am 78cff10f: Add BuildCompatUtils to get an effective platfrom API version
* commit 'bdb05cc89f63f4f3956936fa062d0b4555aa072a': Add BuildCompatUtils to get an effective platfrom API version
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/Settings.java')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/Settings.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java
index 90174e490..9f6862a9d 100644
--- a/java/src/com/android/inputmethod/latin/settings/Settings.java
+++ b/java/src/com/android/inputmethod/latin/settings/Settings.java
@@ -24,6 +24,7 @@ import android.os.Build;
import android.preference.PreferenceManager;
import android.util.Log;
+import com.android.inputmethod.compat.BuildCompatUtils;
import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
import com.android.inputmethod.latin.InputAttributes;
import com.android.inputmethod.latin.R;
@@ -68,9 +69,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
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"));
+ BuildCompatUtils.EFFECTIVE_SDK_INT <= Build.VERSION_CODES.KITKAT;
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 =