Raph Levien 2ab6568046 resolved conflicts for merge of a9cc30ce to master ...

Change-Id: I507bd7a4650f9a7bfe6a0ad7bb8dd4067adb6a8b

2012-05-11 10:43:39 -07:00

..

format

Throw NPE if s is null

2012-01-26 14:25:19 -08:00

method

Fix obvious typos under frameworks/base/core

2012-03-09 22:48:43 +09:00

style

Add fontFamily XML attribute to select font family by string

2012-05-09 23:18:42 -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

…

AndroidCharacter.java

…

Annotation.java

…

AutoText.java

…

BoringLayout.java

Fix bug #5175022 Easy mode in MeasuredText.setPara() is no more used

2011-08-17 17:15:12 -07:00

ClipboardManager.java

…

DynamicLayout.java

TextView's sub display lists have tighten bounds

2012-04-19 18:06:46 -07:00

Editable.java

…

GetChars.java

…

GraphicsOperations.java

Clean getTextRunAdvances() APIs

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

Html.java

Add direct support for HTML formatted text in ClipData etc.

2012-04-13 15:36:06 -07:00

InputFilter.java

…

InputType.java

…

Layout.java

Basic renaming refactoring in Layout

2012-04-25 18:48:42 -07:00

LoginFilter.java

…

MeasuredText.java

Ellipsize avoids spaces and starts right after text

2012-02-23 18:05:59 -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

Final fix in SpannableStringBuilder.

2012-05-04 16:24:49 -07:00

SpannableStringInternal.java

Small optimization when getting the spans

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

Spanned.java

SpannableStringBuilder correctly manages MARK and POINTS

2012-04-26 19:04:03 -07:00

SpannedString.java

…

SpanSet.java

New SpanSet class extracted from TextLine.

2012-03-13 14:58:37 -07:00

SpanWatcher.java

…

StaticLayout.java

Fix bug #3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated

2012-02-29 18:43:14 -08:00

TextDirectionHeuristic.java

Hide TextDirectionHeuristics

2012-05-02 18:20:25 -07:00

TextDirectionHeuristics.java

Hide RTL related APIs - DO NOT MERGE

2012-05-04 13:15:12 -07:00

TextLine.java

New SpanSet class extracted from TextLine.

2012-03-13 14:58:37 -07:00

TextPaint.java

Bug 5281947: add to dictionnary option promoted in suggestions.

2011-09-09 17:01:31 -07:00

TextUtils.java

Merge "Ellipsize avoids spaces and starts right after text"

2012-03-06 13:57:16 -08:00

TextWatcher.java

…