diff options
| author |   Jatin Matani <jatinm@google.com> | 2014-09-12 18:51:23 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 18:51:23 +0000 |
| commit | d07f7c5377672422ebc5679d884fa6870b12f605 (patch) | |
| tree | 13d82ea82ce6f95873aa4d41fc9b6332c8256d98 /java/src/com/android/inputmethod/latin/settings/Settings.java | |
| parent | 464840b96656557a7bfbfdcb0db80382d610c774 (diff) | |
| parent | d0d8f90a32b907b867f8fa934dc7582ff53a9a43 (diff) | |
| download | latinime-d07f7c5377672422ebc5679d884fa6870b12f605.tar.gz latinime-d07f7c5377672422ebc5679d884fa6870b12f605.tar.xz latinime-d07f7c5377672422ebc5679d884fa6870b12f605.zip | |
am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev
* commit 'd0d8f90a32b907b867f8fa934dc7582ff53a9a43':
Reorganize settings in Google Keyboard
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/Settings.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java index 3c7a99102..0de2d8831 100644 --- a/java/src/com/android/inputmethod/latin/settings/Settings.java +++ b/java/src/com/android/inputmethod/latin/settings/Settings.java @@ -42,9 +42,10 @@ import java.util.concurrent.locks.ReentrantLock; public final class Settings implements SharedPreferences.OnSharedPreferenceChangeListener { private static final String TAG = Settings.class.getSimpleName(); // Settings screens - public static final String SCREEN_INPUT = "screen_input"; + public static final String SCREEN_PREFERENCES = "screen_preferences"; + public static final String SCREEN_APPEARANCE = "screen_appearance"; public static final String SCREEN_THEME = "screen_theme"; - public static final String SCREEN_MULTI_LINGUAL = "screen_multi_lingual"; + public static final String SCREEN_MULTILINGUAL = "screen_multilingual"; public static final String SCREEN_GESTURE = "screen_gesture"; public static final String SCREEN_CORRECTION = "screen_correction"; public static final String SCREEN_ADVANCED = "screen_advanced"; @@ -69,6 +70,9 @@ 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"; + // No multilingual options in Android L and above for now. + public static final boolean SHOW_MULTILINGUAL_SETTINGS = + BuildCompatUtils.EFFECTIVE_SDK_INT <= Build.VERSION_CODES.KITKAT; public static final boolean ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS = BuildCompatUtils.EFFECTIVE_SDK_INT <= Build.VERSION_CODES.KITKAT; public static final boolean HAS_UI_TO_ACCEPT_TYPED_WORD = |