Merge "Fix typo of some methods' name" (feea31e9) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -275,7 +275,7 @@ public class Key {
	additionalMoreKeys = style.getStringArray(		additionalMoreKeys = style.getStringArray(
	keyAttr, R.styleable.Keyboard_Key_additionalMoreKeys);		keyAttr, R.styleable.Keyboard_Key_additionalMoreKeys);
	}		}
	moreKeys = KeySpecParser.insertAddtionalMoreKeys(moreKeys, additionalMoreKeys);		moreKeys = KeySpecParser.insertAdditionalMoreKeys(moreKeys, additionalMoreKeys);
	if (moreKeys != null) {		if (moreKeys != null) {
	actionFlags \|= ACTION_FLAGS_ENABLE_LONG_PRESS;		actionFlags \|= ACTION_FLAGS_ENABLE_LONG_PRESS;
	mMoreKeys = new MoreKeySpec[moreKeys.length];		mMoreKeys = new MoreKeySpec[moreKeys.length];

java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -267,7 +267,7 @@ public class KeySpecParser {
	}		}
	}		}

	public static String[] insertAddtionalMoreKeys(String[] moreKeySpecs,		public static String[] insertAdditionalMoreKeys(String[] moreKeySpecs,
	String[] additionalMoreKeySpecs) {		String[] additionalMoreKeySpecs) {
	final String[] moreKeys = filterOutEmptyString(moreKeySpecs);		final String[] moreKeys = filterOutEmptyString(moreKeySpecs);
	final String[] additionalMoreKeys = filterOutEmptyString(additionalMoreKeySpecs);		final String[] additionalMoreKeys = filterOutEmptyString(additionalMoreKeySpecs);

java/src/com/android/inputmethod/latin/AdditionalSubtype.java

+3 −4

java/src/com/android/inputmethod/latin/LatinIME.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -441,7 +441,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen

	loadSettings();		loadSettings();

	SubtypeUtils.setAditionalInputMethodSubtypes(		SubtypeUtils.setAdditionalInputMethodSubtypes(
	this, mSettingsValues.getPrefefinedAdditionalSubtypes());		this, mSettingsValues.getPrefefinedAdditionalSubtypes());

	// TODO: remove the following when it's not needed by updateCorrectionMode() any more		// TODO: remove the following when it's not needed by updateCorrectionMode() any more

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -150,10 +150,10 @@ public class SettingsValues {
	mVoiceKeyOnMain = mVoiceMode != null && mVoiceMode.equals(voiceModeMain);		mVoiceKeyOnMain = mVoiceMode != null && mVoiceMode.equals(voiceModeMain);

	// Predefined additional subtypes		// Predefined additional subtypes
	final InputMethodSubtype DE_QWERTY = AdditionalSubtype.createAddtionalSubtype(		final InputMethodSubtype DE_QWERTY = AdditionalSubtype.createAdditionalSubtype(
	Locale.GERMAN, AdditionalSubtype.QWERTY);		Locale.GERMAN.toString(), AdditionalSubtype.QWERTY);
	final InputMethodSubtype FR_QWERTZ = AdditionalSubtype.createAddtionalSubtype(		final InputMethodSubtype FR_QWERTZ = AdditionalSubtype.createAdditionalSubtype(
	Locale.FRENCH, AdditionalSubtype.QWERTZ);		Locale.FRENCH.toString(), AdditionalSubtype.QWERTZ);
	mPredefinedAdditionalSubtypes = new InputMethodSubtype[] {		mPredefinedAdditionalSubtypes = new InputMethodSubtype[] {
	DE_QWERTY,		DE_QWERTY,
	FR_QWERTZ,		FR_QWERTZ,

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,6 @@ package com.android.inputmethod.latin;
	import android.view.inputmethod.InputMethodSubtype;		import android.view.inputmethod.InputMethodSubtype;

	import java.util.HashMap;		import java.util.HashMap;
	import java.util.Locale;

	public class AdditionalSubtype {		public class AdditionalSubtype {
	public static final String QWERTY = "qwerty";		public static final String QWERTY = "qwerty";
	@@ -43,14 +42,14 @@ public class AdditionalSubtype {
	return subtype.containsExtraValueKey(SUBTYPE_EXTRA_VALUE_IS_ADDITIONAL_SUBTYPE);		return subtype.containsExtraValueKey(SUBTYPE_EXTRA_VALUE_IS_ADDITIONAL_SUBTYPE);
	}		}

	public static InputMethodSubtype createAddtionalSubtype(		public static InputMethodSubtype createAdditionalSubtype(
	Locale locale, String keyboardLayoutSet) {		String localeString, String keyboardLayoutSet) {
	final String extraValue = String.format(		final String extraValue = String.format(
	"%s=%s,%s", LatinIME.SUBTYPE_EXTRA_VALUE_KEYBOARD_LAYOUT_SET, keyboardLayoutSet,		"%s=%s,%s", LatinIME.SUBTYPE_EXTRA_VALUE_KEYBOARD_LAYOUT_SET, keyboardLayoutSet,
	SUBTYPE_EXTRA_VALUE_IS_ADDITIONAL_SUBTYPE);		SUBTYPE_EXTRA_VALUE_IS_ADDITIONAL_SUBTYPE);
	Integer nameId = sKeyboardLayoutToNameIdsMap.get(keyboardLayoutSet);		Integer nameId = sKeyboardLayoutToNameIdsMap.get(keyboardLayoutSet);
	if (nameId == null) nameId = R.string.subtype_generic;		if (nameId == null) nameId = R.string.subtype_generic;
	return new InputMethodSubtype(nameId, R.drawable.ic_subtype_keyboard,		return new InputMethodSubtype(nameId, R.drawable.ic_subtype_keyboard,
	locale.toString(), SUBTYPE_MODE_KEYBOARD, extraValue, false, false);		localeString, SUBTYPE_MODE_KEYBOARD, extraValue, false, false);
	}		}
	}		}