nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix voice key mode default back to "on main keyboard""

Browse source
This commit is contained in:
Tadashi G. Takaoka 2011-07-25 14:52:10 -07:00 committed by Android (Google) Code Review
commit 5800eb48d0
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
java/src/com/android/inputmethod/latin/Settings.java
View file

@ -183,11 +183,11 @@ public class Settings extends InputMethodSettingsActivity
mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true); mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true);
final String voiceMode = prefs.getString(PREF_VOICE_SETTINGS_KEY, null); final String voiceModeMain = res.getString(R.string.voice_mode_main);
mVoiceButtonEnabled = voiceMode != null && !voiceMode.equals( final String voiceModeOff = res.getString(R.string.voice_mode_off);
res.getString(R.string.voice_mode_off)); final String voiceMode = prefs.getString(PREF_VOICE_SETTINGS_KEY, voiceModeMain);
mVoiceButtonOnPrimary = voiceMode != null && voiceMode.equals( mVoiceButtonEnabled = voiceMode != null && !voiceMode.equals(voiceModeOff);
res.getString(R.string.voice_mode_main)); mVoiceButtonOnPrimary = voiceMode != null && voiceMode.equals(voiceModeMain);
Utils.setSystemLocale(res, savedLocale); Utils.setSystemLocale(res, savedLocale);
} }

10
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
View file

@ -361,13 +361,17 @@ public class SubtypeSwitcher {
} }
public boolean isShortcutImeEnabled() { public boolean isShortcutImeEnabled() {
if (mShortcutInputMethodInfo == null) if (mShortcutInputMethodInfo == null) {
return false; return false;
if (mShortcutSubtype == null) }
if (mShortcutSubtype == null) {
return true; return true;
}
// For compatibility, if the shortcut subtype is dummy, we assume the shortcut IME // For compatibility, if the shortcut subtype is dummy, we assume the shortcut IME
// (built-in voice dummy subtype) is available. // (built-in voice dummy subtype) is available.
if (!mShortcutSubtype.hasOriginalObject()) return true; if (!mShortcutSubtype.hasOriginalObject()) {
return true;
}
final boolean allowsImplicitlySelectedSubtypes = true; final boolean allowsImplicitlySelectedSubtypes = true;
for (final InputMethodSubtypeCompatWrapper enabledSubtype : for (final InputMethodSubtypeCompatWrapper enabledSubtype :
mImm.getEnabledInputMethodSubtypeList( mImm.getEnabledInputMethodSubtypeList(