Brad Fitzpatrick 42a5ed2015 resolved conflicts for merge of 171c83f4 to master ...

Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb

2010-09-12 13:55:18 -07:00

..

format

am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread

2010-09-08 11:01:27 -07:00

method

am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread

2010-09-08 15:50:50 -07:00

style

Add documentation for LeadingMarginSpan2.

2010-03-12 15:35:41 -08:00

util

merge from open-source master

2010-06-03 09:03:58 -07:00

AlteredCharSequence.java

…

AndroidBidi.java

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

AndroidCharacter.java

Fix typo in EastAsianWidth javadoc

2010-05-27 06:41:59 -07:00

Annotation.java

…

AutoText.java

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

BoringLayout.java

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

ClipboardManager.java

First pass at a new clipboard API.

2010-08-05 12:28:20 -07:00

DynamicLayout.java

Enable nested bidi levels in a paragraph.

2010-03-31 12:08:55 -07:00

Editable.java

…

GetChars.java

…

GraphicsOperations.java

Move shaping to native.

2010-06-10 14:03:22 -07:00

Html.java

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

InputFilter.java

…

InputType.java

am 12cc9d82: Add a new flag for IMEs to disable suggestions for certain fields.

2009-09-17 08:44:53 -07:00

Layout.java

Support surrogate pairs when layouting text

2010-08-26 08:15:47 +02:00

LoginFilter.java

allow + in usernames

2010-01-14 14:57:20 -08:00

MeasuredText.java

Move shaping to native.

2010-06-10 14:03:22 -07:00

NoCopySpan.java

…

package.html

…

PackedIntVector.java

…

PackedObjectVector.java

…

ParcelableSpan.java

…

Selection.java

Text selection without trackball.

2010-08-19 15:55:02 -07:00

Spannable.java

…

SpannableString.java

…

SpannableStringBuilder.java

Fixed bug in getTextRunCursor.

2010-07-02 22:01:44 -07:00

SpannableStringInternal.java

…

Spanned.java

Fix Javadoc typo for Spanned.SPAN_EXCLUSIVE_INCLUSIVE

2010-05-10 17:44:12 +09:00

SpannedString.java

…

SpanWatcher.java

…

StaticLayout.java

Support surrogate pairs when layouting text

2010-08-26 08:15:47 +02:00

TextLine.java

Fix for end events from Sequencer objects

2010-08-25 17:32:27 -07:00

TextPaint.java

…

TextUtils.java

resolved conflicts for merge of 171c83f4 to master

2010-09-12 13:55:18 -07:00

TextWatcher.java

…