diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-07 23:51:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 23:51:06 +0000 |
| commit | f2474d336a7df696f3897e2cd255d138eb3fac02 (patch) | |
| tree | a05837e54a05ded8a9b2ffc0f52c7dad1176695c /api | |
| parent | b2f9c284cdf1835e48ebbc6b3995590a1b308bf2 (diff) | |
| parent | 6f0fdc4167ad906fc7409856e86cd0cc601c3b53 (diff) | |
| download | frameworks_base-f2474d336a7df696f3897e2cd255d138eb3fac02.zip frameworks_base-f2474d336a7df696f3897e2cd255d138eb3fac02.tar.gz frameworks_base-f2474d336a7df696f3897e2cd255d138eb3fac02.tar.bz2 | |
Merge "Implement better handling of text in assist." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index fa77000..2e2cae6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5822,6 +5822,8 @@ package android.app.assist { method public java.lang.CharSequence getText(); method public int getTextBackgroundColor(); method public int getTextColor(); + method public int[] getTextLineBaselines(); + method public int[] getTextLineCharOffsets(); method public int getTextSelectionEnd(); method public int getTextSelectionStart(); method public float getTextSize(); @@ -36953,6 +36955,7 @@ package android.view { method public abstract void setSelected(boolean); method public abstract void setText(java.lang.CharSequence); method public abstract void setText(java.lang.CharSequence, int, int); + method public abstract void setTextLines(int[], int[]); method public abstract void setTextStyle(float, int, int, int); method public abstract void setTransformation(android.graphics.Matrix); method public abstract void setVisibility(int); diff --git a/api/system-current.txt b/api/system-current.txt index dbe4b8f..e84ad3d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5954,6 +5954,8 @@ package android.app.assist { method public java.lang.CharSequence getText(); method public int getTextBackgroundColor(); method public int getTextColor(); + method public int[] getTextLineBaselines(); + method public int[] getTextLineCharOffsets(); method public int getTextSelectionEnd(); method public int getTextSelectionStart(); method public float getTextSize(); @@ -39243,6 +39245,7 @@ package android.view { method public abstract void setSelected(boolean); method public abstract void setText(java.lang.CharSequence); method public abstract void setText(java.lang.CharSequence, int, int); + method public abstract void setTextLines(int[], int[]); method public abstract void setTextStyle(float, int, int, int); method public abstract void setTransformation(android.graphics.Matrix); method public abstract void setVisibility(int); |