aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/Settings.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-07-25 14:44:47 -0700
committerTadashi G. Takaoka <takaoka@google.com>2011-07-25 14:44:47 -0700
commitf92bd4de2016cbcd09f9f2c8a8e95c3fd6ccbd42 (patch)
tree1e62b0087a9783e5676ba79076cc427293f9fe6f /java/src/com/android/inputmethod/latin/Settings.java
parent7139335dcd84209285c028f5d83cb72bfbf1a966 (diff)
downloadlatinime-f92bd4de2016cbcd09f9f2c8a8e95c3fd6ccbd42.tar.gz
latinime-f92bd4de2016cbcd09f9f2c8a8e95c3fd6ccbd42.tar.xz
latinime-f92bd4de2016cbcd09f9f2c8a8e95c3fd6ccbd42.zip
Fix voice key mode default back to "on main keyboard"
Bug: 5074042 Change-Id: I0c4a09b286c7680306741d47a48d5d9783e4a890
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Settings.java')
-rw-r--r--java/src/com/android/inputmethod/latin/Settings.java10
1 files changed, 5 insertions, 5 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);
}