diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-07-25 14:52:10 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-07-25 14:52:10 -0700 |
| commit | 5800eb48d0226386f7dca27dbbac3d00bcb4f7dc (patch) | |
| tree | a6006451421016edce9ea9ee6c3d84fcad9c7063 /java/src | |
| parent | 2c18ffb97fe06ad6f85695de9c0ba5793d08d945 (diff) | |
| parent | f92bd4de2016cbcd09f9f2c8a8e95c3fd6ccbd42 (diff) | |
| download | latinime-5800eb48d0226386f7dca27dbbac3d00bcb4f7dc.tar.gz latinime-5800eb48d0226386f7dca27dbbac3d00bcb4f7dc.tar.xz latinime-5800eb48d0226386f7dca27dbbac3d00bcb4f7dc.zip | |
Merge "Fix voice key mode default back to "on main keyboard""
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 10 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index b6171d276..6a4837163 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -183,11 +183,11 @@ public class Settings extends InputMethodSettingsActivity mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true); - final String voiceMode = prefs.getString(PREF_VOICE_SETTINGS_KEY, null); - mVoiceButtonEnabled = voiceMode != null && !voiceMode.equals( - res.getString(R.string.voice_mode_off)); - mVoiceButtonOnPrimary = voiceMode != null && voiceMode.equals( - res.getString(R.string.voice_mode_main)); + final String voiceModeMain = res.getString(R.string.voice_mode_main); + final String voiceModeOff = res.getString(R.string.voice_mode_off); + final String voiceMode = prefs.getString(PREF_VOICE_SETTINGS_KEY, voiceModeMain); + mVoiceButtonEnabled = voiceMode != null && !voiceMode.equals(voiceModeOff); + mVoiceButtonOnPrimary = voiceMode != null && voiceMode.equals(voiceModeMain); Utils.setSystemLocale(res, savedLocale); } diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java index 6580cbc08..f10b1b845 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java +++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java @@ -361,13 +361,17 @@ public class SubtypeSwitcher { } public boolean isShortcutImeEnabled() { - if (mShortcutInputMethodInfo == null) + if (mShortcutInputMethodInfo == null) { return false; - if (mShortcutSubtype == null) + } + if (mShortcutSubtype == null) { return true; + } // For compatibility, if the shortcut subtype is dummy, we assume the shortcut IME // (built-in voice dummy subtype) is available. - if (!mShortcutSubtype.hasOriginalObject()) return true; + if (!mShortcutSubtype.hasOriginalObject()) { + return true; + } final boolean allowsImplicitlySelectedSubtypes = true; for (final InputMethodSubtypeCompatWrapper enabledSubtype : mImm.getEnabledInputMethodSubtypeList( |