summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-112-30/+44
|\
| * Merge changes from topic 'grapheme-dr1.5' into mnc-dr1.5-devRaph Levien2016-01-121-22/+34
| |\
| | * Respect grapheme clusters in Layout#getOffsetForHorizontal.Keisuke Kuroyanagi2016-01-111-24/+31
| | * Fix: Cursor can be at an invalid offset in EditText.Keisuke Kuroyanagi2016-01-111-5/+10
| * | Fix measurement to respect grapheme and span boundariesRaph Levien2016-01-111-8/+10
| |/
* | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/fra...Steve Kondik2015-12-072-19/+41
|\ \ | |/
| * Fix line height problem with inline images in StaticLayout.Roozbeh Pournader2015-10-161-2/+4
| * Merge "Load binary hyphen data files" into mnc-dr-devRoozbeh Pournader2015-10-152-11/+26
| |\
| | * Load binary hyphen data filesRaph Levien2015-10-142-11/+26
| * | Make Hyphenator#get() return an object.Roozbeh Pournader2015-10-142-6/+11
| |/
* | Fix "Select correct 12 or 24 time format" breaking ChromeWilhelm Fitzpatrick2015-10-281-9/+20
* | Base: Mirroring layout on RTL languages [1/2]Arthur Zamarin2015-10-261-5/+7
* | keyboard: re-add code to detect lid state and handle lightsMichael Gernoth2015-10-181-0/+31
|/
* Merge "Release text when finishing StaticLayout.Builder" into mnc-devRaph Levien2015-07-291-0/+4
|\
| * Release text when finishing StaticLayout.BuilderRaph Levien2015-07-291-0/+4
* | Allow soft hyphens in languages without patternsRaph Levien2015-07-271-11/+13
|/
* Merge "Respect style boundaries when measuring text" into mnc-devRaph Levien2015-07-211-2/+2
|\
| * Respect style boundaries when measuring textRaph Levien2015-07-201-2/+2
* | Merge "Fix default value of stereoReset() in the documentation." into mnc-devRoozbeh Pournader2015-07-201-7/+8
|\ \
| * | Fix default value of stereoReset() in the documentation.Roozbeh Pournader2015-07-201-7/+8
| |/
* | Bidi-wrap the results of format[Short]FileSize().Roozbeh Pournader2015-07-171-5/+26
|/
* Merge "Improve Html.toHtml() documentation" into mnc-devRaph Levien2015-07-111-1/+6
|\
| * Improve Html.toHtml() documentationRaph Levien2015-07-101-1/+6
* | Merge "Reduce cost of span type checking" into mnc-devChris Craik2015-07-101-4/+5
|\ \
| * | Reduce cost of span type checkingChris Craik2015-07-101-4/+5
* | | Merge "Fix StaticLayout crash when maxLines = 0" into mnc-devRaph Levien2015-07-101-1/+2
|\ \ \ | |_|/ |/| |
| * | Fix StaticLayout crash when maxLines = 0Raph Levien2015-07-091-1/+2
| |/
* | Delete dead codeJohn Reck2015-07-091-2/+0
* | Slightly more precise RTL check in BoringLayout.isBoring()Raph Levien2015-07-091-1/+9
|/
* Merge "Fix problems with StaticLayout indentation" into mnc-devRaph Levien2015-07-062-11/+79
|\
| * Fix problems with StaticLayout indentationRaph Levien2015-07-012-11/+79
* | Clean up Hyphenator file readingRaph Levien2015-07-061-9/+6
|/
* Merge "Text selection: Fix word boundaries for languages without spaces" into...Mady Mellor2015-06-261-10/+94
|\
| * Text selection: Fix word boundaries for languages without spacesMady Mellor2015-06-221-10/+94
* | Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc...Keisuke Kuroyanagi2015-06-261-0/+21
|\ \
| * | Fix: Ellipsis is wrongly applied or not applied in TextView.Keisuke Kuroyanagi2015-06-151-0/+21
* | | Fix Formatter.formatBytes() crash on non-EN localesMakoto Onuki2015-06-251-14/+27
* | | Merge "Revive Null check for backward compatibility." into mnc-devSeigo Nonaka2015-06-231-2/+9
|\ \ \
| * | | Revive Null check for backward compatibility.Seigo Nonaka2015-06-221-2/+9
| | |/ | |/|
* | | Forget private partition keys.Jeff Sharkey2015-06-221-0/+5
|/ /
* | Merge "Update file size formatting." into mnc-devJeff Sharkey2015-06-161-16/+48
|\ \
| * | Update file size formatting.Jeff Sharkey2015-06-151-16/+48
* | | am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.John Spurlock2015-06-151-1/+1
|\ \ \ | |/ / |/| |
| * | am 1ad5c813: Fix typo in TtsSpan.John Spurlock2015-06-151-1/+1
| |\ \
| | * | Fix typo in TtsSpan.John Spurlock2015-06-151-1/+1
* | | | Selected count string needs plurals.Jeff Sharkey2015-06-111-0/+9
| |_|/ |/| |
* | | Fix documentation of nextSpanTransition off by oneRaph Levien2015-06-101-6/+5
* | | Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into ...Alan Viverette2015-06-0426-11/+266
|\ \ \
| * | | Prevent poorly-extended ParcelableSpans from writing to parcelsAlan Viverette2015-06-0226-11/+266
* | | | Rename setTextDir to setTextDirectionRaph Levien2015-06-032-3/+3