Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use CharSequence instead of String in CursorAnchorInfo

Browse Source 
This might be useful if we need to pass some spans from the
application to the input method through CursorAnchorInfo.

This change makes CursorAnchorInfo more consistent with other
input method APIs where CharSequence is preferred over String.

BUG: 15088391
Change-Id: Ie04e8a27050849fee1c93ef14b9944acc70fafe4
This commit is contained in:
Yohei Yukawa
2014-06-27 12:24:20 +09:00
parent 0c9b72b09f
commit a1fda005f9
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -34840,7 +34840,7 @@ package android.view.inputmethod {
ctor public CursorAnchorInfo(android.os.Parcel);
method public int describeContents();
method public android.graphics.RectF getCharacterRect(int);
method public java.lang.String getComposingText();
method public java.lang.CharSequence getComposingText();
method public int getComposingTextStart();
method public float getInsertionMarkerBaseline();
method public float getInsertionMarkerBottom();

15
core/java/android/view/inputmethod/CursorAnchorInfo.java
View File

@@ -21,6 +21,8 @@ import android.graphics.RectF;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.Layout;
import android.text.SpannedString;
import android.text.TextUtils;
import android.view.inputmethod.SparseRectFArray.SparseRectFArrayBuilder;
import java.util.Objects;
@@ -40,7 +42,7 @@ public final class CursorAnchorInfo implements Parcelable {
/**
* The text, tracked as a composing region.
*/
private final String mComposingText;
private final CharSequence mComposingText;
/**
* Horizontal position of the insertion marker, in the local coordinates that will be
@@ -88,7 +90,7 @@ public final class CursorAnchorInfo implements Parcelable {
mSelectionStart = source.readInt();
mSelectionEnd = source.readInt();
mComposingTextStart = source.readInt();
mComposingText = source.readString();
mComposingText = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
mInsertionMarkerHorizontal = source.readFloat();
mInsertionMarkerTop = source.readFloat();
mInsertionMarkerBaseline = source.readFloat();
@@ -109,7 +111,7 @@ public final class CursorAnchorInfo implements Parcelable {
dest.writeInt(mSelectionStart);
dest.writeInt(mSelectionEnd);
dest.writeInt(mComposingTextStart);
dest.writeString(mComposingText);
TextUtils.writeToParcel(mComposingText, dest, flags);
dest.writeFloat(mInsertionMarkerHorizontal);
dest.writeFloat(mInsertionMarkerTop);
dest.writeFloat(mInsertionMarkerBaseline);
@@ -210,12 +212,13 @@ public final class CursorAnchorInfo implements Parcelable {
if (composingText == null) {
mComposingText = null;
} else {
mComposingText = composingText.toString();
// Make a snapshot of the given char sequence.
mComposingText = new SpannedString(composingText);
}
return this;
}
private int mComposingTextStart = -1;
private String mComposingText = null;
private CharSequence mComposingText = null;
/**
* Sets the location of the text insertion point (zero width cursor) as a rectangle in
@@ -362,7 +365,7 @@ public final class CursorAnchorInfo implements Parcelable {
* Returns the entire composing text.
* @return null if there is no composition.
*/
public String getComposingText() {
public CharSequence getComposingText() {
return mComposingText;
}