am 80fe84b3: Merge "Consolidate voice input key options no.1" (82b149c0) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml/prefs.xml

+3 −5

Original line number	Diff line number	Diff line
		@@ -42,13 +42,11 @@
		android:title="@string/popup_on_keypress"
		android:persistent="true"
		android:defaultValue="@bool/config_default_key_preview_popup" />
		<ListPreference
		android:key="voice_mode"
		<CheckBoxPreference
		android:key="pref_voice_input_key"
		android:title="@string/voice_input"
		android:persistent="true"
		android:entryValues="@array/voice_input_modes_values"
		android:entries="@array/voice_input_modes"
		android:defaultValue="@string/voice_mode_main" />
		android:defaultValue="true" />
		</PreferenceCategory>
		<PreferenceCategory
		android:title="@string/correction_category"

java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,8 @@ public final class KeyboardLayoutSet {
		EditorInfo mEditorInfo;
		boolean mDisableTouchPositionCorrectionDataForTest;
		boolean mVoiceKeyEnabled;
		// TODO: Remove mVoiceKeyOnMain when it's certainly confirmed that we no longer show
		// the voice input key on the symbol layout
		boolean mVoiceKeyOnMain;
		boolean mNoSettingsKey;
		boolean mLanguageSwitchKeyEnabled;
		@@ -259,6 +261,8 @@ public final class KeyboardLayoutSet {
		return this;
		}

		// TODO: Remove mVoiceKeyOnMain when it's certainly confirmed that we no longer show
		// the voice input key on the symbol layout
		public Builder setOptions(final boolean voiceKeyEnabled, final boolean voiceKeyOnMain,
		final boolean languageSwitchKeyEnabled) {
		@SuppressWarnings("deprecation")

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		builder.setSubtype(mSubtypeSwitcher.getCurrentSubtype());
		builder.setOptions(
		settingsValues.isVoiceKeyEnabled(editorInfo),
		settingsValues.isVoiceKeyOnMain(),
		true /* always show a voice key on the main keyboard */,
		settingsValues.isLanguageSwitchKeyEnabled());
		mKeyboardLayoutSet = builder.build();
		try {

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,9 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
		public static final String PREF_VIBRATE_ON = "vibrate_on";
		public static final String PREF_SOUND_ON = "sound_on";
		public static final String PREF_POPUP_ON = "popup_on";
		public static final String PREF_VOICE_MODE = "voice_mode";
		// PREF_VOICE_MODE_OBSOLETE is obsolete. Use PREF_VOICE_INPUT_KEY instead.
		public static final String PREF_VOICE_MODE_OBSOLETE = "voice_mode";
		public static final String PREF_VOICE_INPUT_KEY = "pref_voice_input_key";
		public static final String PREF_CORRECTION_SETTINGS = "correction_settings";
		public static final String PREF_EDIT_PERSONAL_DICTIONARY = "edit_personal_dictionary";
		public static final String PREF_CONFIGURE_DICTIONARIES_KEY = "configure_dictionaries_key";

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

+6 −14

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
		DBG_USE_INTERNAL_PERSONAL_DICTIONARY_SETTINGS
		\|\| Build.VERSION.SDK_INT <= 18 /* Build.VERSION.JELLY_BEAN_MR2 */;

		private ListPreference mVoicePreference;
		private CheckBoxPreference mVoiceInputKeyPreference;
		private ListPreference mShowCorrectionSuggestionsPreference;
		private ListPreference mAutoCorrectionThresholdPreference;
		private ListPreference mKeyPreviewPopupDismissDelay;
		@@ -107,7 +107,8 @@ public final class SettingsFragment extends InputMethodSettingsFragment
		SubtypeLocaleUtils.init(context);
		AudioAndHapticFeedbackManager.init(context);

		mVoicePreference = (ListPreference) findPreference(Settings.PREF_VOICE_MODE);
		mVoiceInputKeyPreference =
		(CheckBoxPreference) findPreference(Settings.PREF_VOICE_INPUT_KEY);
		mShowCorrectionSuggestionsPreference =
		(ListPreference) findPreference(Settings.PREF_SHOW_SUGGESTIONS_SETTING);
		final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
		@@ -166,7 +167,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
		final boolean showVoiceKeyOption = res.getBoolean(
		R.bool.config_enable_show_voice_key_option);
		if (!showVoiceKeyOption) {
		generalSettings.removePreference(mVoicePreference);
		generalSettings.removePreference(mVoiceInputKeyPreference);
		}

		final PreferenceGroup advancedSettings =
		@@ -243,10 +244,8 @@ public final class SettingsFragment extends InputMethodSettingsFragment
		public void onResume() {
		super.onResume();
		final boolean isShortcutImeEnabled = SubtypeSwitcher.getInstance().isShortcutImeEnabled();
		if (isShortcutImeEnabled) {
		updateVoiceModeSummary();
		} else {
		getPreferenceScreen().removePreference(mVoicePreference);
		if (!isShortcutImeEnabled) {
		getPreferenceScreen().removePreference(mVoiceInputKeyPreference);
		}
		final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
		final CheckBoxPreference showSetupWizardIcon =
		@@ -287,7 +286,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment
		LauncherIconVisibilityManager.updateSetupWizardIconVisibility(getActivity());
		}
		ensureConsistencyOfAutoCorrectionSettings();
		updateVoiceModeSummary();
		updateShowCorrectionSuggestionsSummary();
		updateKeyPreviewPopupDelaySummary();
		refreshEnablingsOfKeypressSoundAndVibrationSettings(prefs, getResources());
		@@ -330,12 +328,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment
		lp.setSummary(entries[lp.findIndexOfValue(lp.getValue())]);
		}

		private void updateVoiceModeSummary() {
		mVoicePreference.setSummary(
		getResources().getStringArray(R.array.voice_input_modes_summary)
		[mVoicePreference.findIndexOfValue(mVoicePreference.getValue())]);
		}

		private void refreshEnablingsOfKeypressSoundAndVibrationSettings(
		final SharedPreferences sp, final Resources res) {
		setPreferenceEnabled(Settings.PREF_VIBRATION_DURATION_SETTINGS,