diff options
author | 2011-05-20 12:36:10 +0900 | |
---|---|---|
committer | 2011-05-20 12:36:46 +0900 | |
commit | d794c6f0788a65a4ec623de3f8f05122621d665f (patch) | |
tree | 7b8a0fa991bec69b588c9bf5527365e692b83dfc /java/src/com/android/inputmethod/latin/LatinIME.java | |
parent | 0e8bbe3ab48a33b8418bec6930174c37ba561399 (diff) | |
download | latinime-d794c6f0788a65a4ec623de3f8f05122621d665f.tar.gz latinime-d794c6f0788a65a4ec623de3f8f05122621d665f.tar.xz latinime-d794c6f0788a65a4ec623de3f8f05122621d665f.zip |
Remove manual config item controlling to show input language settings
Change-Id: I77f831c653567f2cf214a5b61107b25cca6d751d
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 18f743883..4db34c5c2 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1007,14 +1007,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } private void onSettingsKeyPressed() { - if (!isShowingOptionDialog()) { - if (!mSettingsValues.mEnableShowSubtypeSettings) { - showSubtypeSelectorAndSettings(); - } else if (Utils.hasMultipleEnabledIMEsOrSubtypes(mImm)) { - showOptionsMenu(); - } else { - launchSettings(); - } + if (isShowingOptionDialog()) + return; + if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) { + showSubtypeSelectorAndSettings(); + } else if (Utils.hasMultipleEnabledIMEsOrSubtypes(mImm)) { + showOptionsMenu(); + } else { + launchSettings(); } } |