Bug 856755 - Return SpannableString or String in extracted text; r=cpeterson

This commit is contained in:
Jim Chen 2013-04-02 11:24:40 -04:00
parent f0fab7f5b7
commit c0248d24f7

View File

@ -17,6 +17,7 @@ import android.os.SystemClock;
import android.text.Editable; import android.text.Editable;
import android.text.InputType; import android.text.InputType;
import android.text.Selection; import android.text.Selection;
import android.text.SpannableString;
import android.text.method.KeyListener; import android.text.method.KeyListener;
import android.text.method.TextKeyListener; import android.text.method.TextKeyListener;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
@ -313,8 +314,11 @@ class GeckoInputConnection
extract.selectionStart = selStart; extract.selectionStart = selStart;
extract.selectionEnd = selEnd; extract.selectionEnd = selEnd;
extract.startOffset = 0; extract.startOffset = 0;
extract.text = editable; if ((req.flags & GET_TEXT_WITH_STYLES) != 0) {
extract.text = new SpannableString(editable);
} else {
extract.text = editable.toString();
}
return extract; return extract;
} }
@ -428,8 +432,11 @@ class GeckoInputConnection
mUpdateExtract.selectionEnd = mUpdateExtract.selectionEnd =
Selection.getSelectionEnd(editable); Selection.getSelectionEnd(editable);
mUpdateExtract.startOffset = 0; mUpdateExtract.startOffset = 0;
mUpdateExtract.text = editable; if ((mUpdateRequest.flags & GET_TEXT_WITH_STYLES) != 0) {
mUpdateExtract.text = new SpannableString(editable);
} else {
mUpdateExtract.text = editable.toString();
}
imm.updateExtractedText(v, mUpdateRequest.token, imm.updateExtractedText(v, mUpdateRequest.token,
mUpdateExtract); mUpdateExtract);
} }