diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-21 15:10:07 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 15:10:07 +0000 |
| commit | d94645097a8aab6c44c6a20553f81954009dbc5b (patch) | |
| tree | 8743018b4a2fe61f16943783f5b2331592e3a69d /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | 20ae86172e644b1aae97e0ea22c41433bd7ccc9e (diff) | |
| parent | 46a007261fcbfbe887e22ecdf16307f95b1e4024 (diff) | |
| download | latinime-d94645097a8aab6c44c6a20553f81954009dbc5b.tar.gz latinime-d94645097a8aab6c44c6a20553f81954009dbc5b.tar.xz latinime-d94645097a8aab6c44c6a20553f81954009dbc5b.zip | |
am 46a00726: Merge "Fix some compiler warnings"
* commit '46a007261fcbfbe887e22ecdf16307f95b1e4024':
Fix some compiler warnings
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsValues.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index 660b4e095..5b99652b8 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -273,9 +273,8 @@ public class SettingsValues { final RichInputMethodManager imm = RichInputMethodManager.getInstance(); if (mIncludesOtherImesInLanguageSwitchList) { return imm.hasMultipleEnabledIMEsOrSubtypes(false /* include aux subtypes */); - } else { - return imm.hasMultipleEnabledSubtypesInThisIme(false /* include aux subtypes */); } + return imm.hasMultipleEnabledSubtypesInThisIme(false /* include aux subtypes */); } public boolean isSameInputType(final EditorInfo editorInfo) { |