Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcaf47f0 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Refactor show voice key preferece migration code 

Change-Id: I4f13e85a3db1ba4adf36c596cb23827bdcf93ae7
parent 9d4d61f9

java/src/com/android/inputmethod/latin/settings/SettingsValues.java

+8 −8
Original line number Diff line number Diff line
@@ -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}.

        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();

        }

            prefs.edit()

                    .putBoolean(Settings.PREF_VOICE_INPUT_KEY, shouldShowVoiceInputKey)

                    // Remove the obsolete preference if exists.

        if (prefs.contains(Settings.PREF_VOICE_MODE_OBSOLETE)) {

            prefs.edit().remove(Settings.PREF_VOICE_MODE_OBSOLETE).apply();

                    .remove(Settings.PREF_VOICE_MODE_OBSOLETE)

                    .apply();

        }

        return prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, true);

    }