Conley Owens f4c4a276e2 Merge commit 'f395e304' into m ...

Conflicts:
	core/tests/coretests/src/android/text/TextUtilsTest.java

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784

2011-05-02 10:25:55 -07:00

..

format

am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."

2011-02-28 10:15:48 -08:00

method

am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references."

2011-04-29 15:11:30 -07:00

style

am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."

2011-04-29 15:11:26 -07:00

util

am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"

2011-04-04 15:25:33 -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

…

BoringLayout.java

TextView's baseline is correctly computed for empty text.

2011-04-28 15:08:57 -07:00

CharSequenceIterator.java

Fix in BreakIterator.

2011-04-08 11:33:23 -07:00

ClipboardManager.java

Some new API cleanup.

2011-01-04 17:42:01 -08:00

DynamicLayout.java

Pixel were missing on the last line of text when using MaxLines.

2011-01-30 18:23:13 -08:00

Editable.java

…

GetChars.java

…

GraphicsOperations.java

Clean getTextRunAdvances() APIs

2011-04-21 17:36:26 -07:00

Html.java

…

InputFilter.java

JPtextinput: Dont break emoji characters when cutting strings.

2011-01-10 08:23:15 +01:00

InputType.java

Add TYPE_NUMBER_VARIATION_PASSWORD for entering a numeric password.

2010-12-25 01:22:53 +09:00

Layout.java

am 8b22ef66: am e41d2aed: Merge "Using robust equality check."

2011-04-29 14:56:15 -07:00

LoginFilter.java

…

MeasuredText.java

Remove MeasuredText debug messages

2011-01-31 13:54:58 -08:00

NoCopySpan.java

…

package.html

…

PackedIntVector.java

…

PackedObjectVector.java

…

ParcelableSpan.java

…

Selection.java

Extracted WordIterator class.

2011-04-20 15:34:36 -07:00

Spannable.java

…

SpannableString.java

…

SpannableStringBuilder.java

SuggestionSpans are removed around edited text.

2011-04-29 13:27:37 -07:00

SpannableStringInternal.java

Small optimization when getting the spans

2011-02-15 14:31:26 -08:00

Spanned.java

Fix Javadoc typo for Spanned.SPAN_EXCLUSIVE_INCLUSIVE

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

SpannedString.java

…

SpanWatcher.java

…

StaticLayout.java

Empty spans are not considered in text layout/rendering process.

2011-03-09 17:17:40 -08:00

TextLine.java

TextView's baseline is correctly computed for empty text.

2011-04-28 15:08:57 -07:00

TextPaint.java

…

TextUtils.java

Merge commit 'f395e304' into m

2011-05-02 10:25:55 -07:00

TextWatcher.java

…