am 78e76847: Merge "getTextRunCursor gets deprecated in SpannableStringBuilder" into honeycomb-mr1

* commit '78e7684713ddac5e8e3cf69b702cbcb4e473aacd':
  getTextRunCursor gets deprecated in SpannableStringBuilder
This commit is contained in:
Gilles Debunne
2011-03-04 11:39:09 -08:00
committed by Android Git Automerger
2 changed files with 4 additions and 2 deletions

View File

@ -194914,7 +194914,7 @@
synchronized="false" synchronized="false"
static="false" static="false"
final="false" final="false"
deprecated="not deprecated" deprecated="deprecated"
visibility="public" visibility="public"
> >
<parameter name="contextStart" type="int"> <parameter name="contextStart" type="int">
@ -266773,7 +266773,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="arg0" type="T"> <parameter name="t" type="T">
</parameter> </parameter>
</method> </method>
</interface> </interface>

View File

@ -1192,7 +1192,9 @@ implements CharSequence, GetChars, Spannable, Editable, Appendable,
* CURSOR_AT_OR_BEFORE, or CURSOR_AT * CURSOR_AT_OR_BEFORE, or CURSOR_AT
* @param p the Paint object that is requesting this information * @param p the Paint object that is requesting this information
* @return the offset of the next position, or -1 * @return the offset of the next position, or -1
* @deprecated This is an internal method, refrain from using it in your code
*/ */
@Deprecated
public int getTextRunCursor(int contextStart, int contextEnd, int flags, int offset, public int getTextRunCursor(int contextStart, int contextEnd, int flags, int offset,
int cursorOpt, Paint p) { int cursorOpt, Paint p) {