am 775e986e: Merge "Fix add single character check" into ics-mr1 (0551287f) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebTextView.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -567,7 +567,6 @@ import java.util.ArrayList;
	mPreChange.substring(0, mMaxLength).equals(postChange))) {		mPreChange.substring(0, mMaxLength).equals(postChange))) {
	return;		return;
	}		}
	mPreChange = postChange;
	if (0 == count) {		if (0 == count) {
	if (before > 0) {		if (before > 0) {
	// For this and all changes to the text, update our cache		// For this and all changes to the text, update our cache
	@@ -605,9 +604,9 @@ import java.util.ArrayList;
	// Prefer sending javascript events, so when adding one character,		// Prefer sending javascript events, so when adding one character,
	// don't replace the unchanged text.		// don't replace the unchanged text.
	if (count > 1 && before == count - 1) {		if (count > 1 && before == count - 1) {
	String replaceButOne = s.subSequence(start,		String replaceButOne = mPreChange.subSequence(start,
	start + before).toString();		start + before).toString();
	String replacedString = getText().subSequence(start,		String replacedString = s.subSequence(start,
	start + before).toString();		start + before).toString();
	if (replaceButOne.equals(replacedString)) {		if (replaceButOne.equals(replacedString)) {
	// we're just adding one character		// we're just adding one character
	@@ -616,6 +615,7 @@ import java.util.ArrayList;
	count = 1;		count = 1;
	}		}
	}		}
			mPreChange = postChange;
	// Find the last character being replaced. If it can be represented by		// Find the last character being replaced. If it can be represented by
	// events, we will pass them to native so we can see javascript events.		// events, we will pass them to native so we can see javascript events.
	// Otherwise, replace the text being changed in the textfield.		// Otherwise, replace the text being changed in the textfield.