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

am a12d431c: Merge "Refactor show voice key preferece migration code" 

* commit 'a12d431c868c7e3e7a24da7a62d07f7835a22766':
  Refactor show voice key preferece migration code
main
Tadashi G. Takaoka 2014-06-05 09:35:37 +00:00 committed by Android Git Automerger
parent 369bb9679d a12d431c86
commit c7b35c7d05
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
java/src/com/android/inputmethod/latin/settings/SettingsValues.java
View File

@ -318,18 +318,18 @@ public final class SettingsValues {
private static boolean needsToShowVoiceInputKey(final SharedPreferences prefs,
final Resources res) {
if (!prefs.contains(Settings.PREF_VOICE_INPUT_KEY)) {
// Migrate preference from {@link Settings#PREF_VOICE_MODE_OBSOLETE} to
// {@link Settings#PREF_VOICE_INPUT_KEY}.
// Migrate preference from {@link Settings#PREF_VOICE_MODE_OBSOLETE} to
// {@link Settings#PREF_VOICE_INPUT_KEY}.
if (prefs.contains(Settings.PREF_VOICE_MODE_OBSOLETE)) {
final String voiceModeMain = res.getString(R.string.voice_mode_main);
final String voiceMode = prefs.getString(
Settings.PREF_VOICE_MODE_OBSOLETE, voiceModeMain);
final boolean shouldShowVoiceInputKey = voiceModeMain.equals(voiceMode);
prefs.edit().putBoolean(Settings.PREF_VOICE_INPUT_KEY, shouldShowVoiceInputKey).apply();
}
// Remove the obsolete preference if exists.
if (prefs.contains(Settings.PREF_VOICE_MODE_OBSOLETE)) {
prefs.edit().remove(Settings.PREF_VOICE_MODE_OBSOLETE).apply();
prefs.edit()
.putBoolean(Settings.PREF_VOICE_INPUT_KEY, shouldShowVoiceInputKey)
// Remove the obsolete preference if exists.
.remove(Settings.PREF_VOICE_MODE_OBSOLETE)
.apply();
}
return prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, true);
}