Gilles Debunne 925f2f9096 resolved conflicts for merge of 9765b2a0 to master ...

Change-Id: Ic37a443fff0425e9d7c8395f71665d56c38d7e53

2010-08-24 15:14:12 -07:00

..

format

Documentation Bug (Issue 9557)

2010-07-06 20:42:22 +02:00

method

resolved conflicts for merge of 9765b2a0 to master

2010-08-24 15:14:12 -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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

GetChars.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

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

Speedup TextView fades (no more layers required.)

2010-08-18 20:48:33 -07: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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PackedIntVector.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PackedObjectVector.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ParcelableSpan.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Selection.java

Text selection without trackball.

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

Spannable.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SpannableString.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SpannableStringBuilder.java

Fixed bug in getTextRunCursor.

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

SpannableStringInternal.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Spanned.java

Fix Javadoc typo for Spanned.SPAN_EXCLUSIVE_INCLUSIVE

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

SpannedString.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SpanWatcher.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

StaticLayout.java

Fix a bug where paragraph styles could leak onto an adjacent empty line.

2010-08-05 15:29:36 -07:00

TextLine.java

New cursor controller in TextViews.

2010-07-09 16:20:21 -07:00

TextPaint.java

Make <font size> and <font height> in string resources respect density.

2009-08-12 16:04:10 -07:00

TextUtils.java

Refactor Styled utility functions into reusable objects.

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

TextWatcher.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00