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

Commit a828f613 authored Feb 08, 2012 by Jean Chalard Committed by Android (Google) Code Review Feb 08, 2012

Merge "Some more simplification"

parents 4721427c 6a800b25

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2107,13 +2107,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
	CharSequence toLeft = ic.getTextBeforeCursor(1, 0);		CharSequence toLeft = ic.getTextBeforeCursor(1, 0);
	CharSequence toRight = ic.getTextAfterCursor(1, 0);		CharSequence toRight = ic.getTextAfterCursor(1, 0);
	if (!TextUtils.isEmpty(toLeft)		if (!TextUtils.isEmpty(toLeft)
	&& !mSettingsValues.isWordSeparator(toLeft.charAt(0))		&& !mSettingsValues.isWordSeparator(toLeft.charAt(0))) {
	&& !mSettingsValues.isSuggestedPunctuation(toLeft.charAt(0))) {
	return true;		return true;
	}		}
	if (!TextUtils.isEmpty(toRight)		if (!TextUtils.isEmpty(toRight)
	&& !mSettingsValues.isWordSeparator(toRight.charAt(0))		&& !mSettingsValues.isWordSeparator(toRight.charAt(0))) {
	&& !mSettingsValues.isSuggestedPunctuation(toRight.charAt(0))) {
	return true;		return true;
	}		}
	return false;		return false;

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -222,10 +222,6 @@ public class SettingsValues {
	res.getBoolean(R.bool.config_default_vibration_enabled));		res.getBoolean(R.bool.config_default_vibration_enabled));
	}		}

	public boolean isSuggestedPunctuation(int code) {
	return mSuggestPuncs.contains(String.valueOf((char)code));
	}

	public boolean isWordSeparator(int code) {		public boolean isWordSeparator(int code) {
	return mWordSeparators.contains(String.valueOf((char)code));		return mWordSeparators.contains(String.valueOf((char)code));
	}		}