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

Commit 3f8c6b8c authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Add description of disabled voice input key option"

parents e91559a1 12ba821b

java/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -249,6 +249,8 @@ 


    <!-- Preferences item for enabling speech input -->

    <string name="voice_input">Voice input key</string>

    <!-- The summary text to describe the reason why the "Voice input key" option is disabled. [CHAR LIMIT=100] -->

    <string name="voice_input_disabled_summary">No voice input methods enabled. Check Language &amp; input settings.</string>



    <!-- Title for configuring input method settings [CHAR LIMIT=35] -->

    <string name="configure_input_method">Configure input methods</string>

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

+8 −2
Original line number Diff line number Diff line
@@ -238,8 +238,14 @@ public final class SettingsFragment extends InputMethodSettingsFragment 
        super.onResume();

        final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();

        final Resources res = getResources();

        final boolean isShortcutImeEnabled = SubtypeSwitcher.getInstance().isShortcutImeEnabled();

        setPreferenceEnabled(Settings.PREF_VOICE_INPUT_KEY, isShortcutImeEnabled);

        final Preference voiceInputKeyOption = findPreference(Settings.PREF_VOICE_INPUT_KEY);

        if (voiceInputKeyOption != null) {

            final boolean isShortcutImeEnabled = SubtypeSwitcher.getInstance()

                    .isShortcutImeEnabled();

            voiceInputKeyOption.setEnabled(isShortcutImeEnabled);

            voiceInputKeyOption.setSummary(isShortcutImeEnabled ? null

                    : res.getText(R.string.voice_input_disabled_summary));

        }

        final CheckBoxPreference showSetupWizardIcon =

                (CheckBoxPreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);

        if (showSetupWizardIcon != null) {