summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-05-15 01:32:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-15 01:32:12 +0000
commit9edfec8b4527c62f594adb275e49f6d6ca945c05 (patch)
treeedade0f644173c9a76cf8f4ba8f066d681eedee4 /api
parent2c5d97875bde93efce00a921e76b2f231e9b0e10 (diff)
parent81f4cb3f858f46a4d9b793c4d326b9bf6aca868d (diff)
downloadframeworks_base-9edfec8b4527c62f594adb275e49f6d6ca945c05.zip
frameworks_base-9edfec8b4527c62f594adb275e49f6d6ca945c05.tar.gz
frameworks_base-9edfec8b4527c62f594adb275e49f6d6ca945c05.tar.bz2
Merge "Enable CursorAnchorInfo to contain composing string"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index 2b05f2f..22892d8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -33574,9 +33574,9 @@ package android.view.inputmethod {
public final class CursorAnchorInfo implements android.os.Parcelable {
ctor public CursorAnchorInfo(android.os.Parcel);
method public int describeContents();
- method public int getCandidatesEnd();
- method public int getCandidatesStart();
method public android.graphics.RectF getCharacterRect(int);
+ method public java.lang.String getComposingText();
+ method public int getComposingTextStart();
method public float getInsertionMarkerBaseline();
method public float getInsertionMarkerBottom();
method public float getInsertionMarkerHorizontal();
@@ -33593,7 +33593,7 @@ package android.view.inputmethod {
method public android.view.inputmethod.CursorAnchorInfo.CursorAnchorInfoBuilder addCharacterRect(int, float, float, float, float);
method public android.view.inputmethod.CursorAnchorInfo build();
method public void reset();
- method public android.view.inputmethod.CursorAnchorInfo.CursorAnchorInfoBuilder setCandidateRange(int, int);
+ method public android.view.inputmethod.CursorAnchorInfo.CursorAnchorInfoBuilder setComposingText(int, java.lang.CharSequence);
method public android.view.inputmethod.CursorAnchorInfo.CursorAnchorInfoBuilder setInsertionMarkerLocation(float, float, float, float);
method public android.view.inputmethod.CursorAnchorInfo.CursorAnchorInfoBuilder setMatrix(android.graphics.Matrix);
method public android.view.inputmethod.CursorAnchorInfo.CursorAnchorInfoBuilder setSelectionRange(int, int);