summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-241-0/+3
|\
| * Deprecating FloatMath and TimeNeil Fuller2014-10-231-0/+3
* | am 1802567a: am e4625cc1: Merge "Fix Time docs to document various error cases"Neil Fuller2014-10-151-3/+30
|\ \
| * \ Merge "Fix Time docs to document various error cases"Neil Fuller2014-10-151-3/+30
| |\ \
| | * | Fix Time docs to document various error casesNeil Fuller2014-10-151-3/+30
* | | | am 58f75627: am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documenta...Newton Allen2014-10-021-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix some documentation typos.Newton Allen2014-09-301-3/+3
* | | | resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-021-3/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-011-3/+2
| | |/ | |/|
* | | am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellip...Elliott Hughes2014-09-191-6/+3
|\ \ \ | |/ /
| * | Merge "Use constants instead of resources for ellipsis."Elliott Hughes2014-09-191-6/+3
| |\ \
| | * | Use constants instead of resources for ellipsis.Igor Viarheichyk2014-09-191-6/+3
* | | | resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aospElliott Hughes2014-09-081-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "Small documentation fixes across many files."Elliott Hughes2014-09-081-1/+1
| |\ \ | | |/ | |/|
| | * Small documentation fixes across many files.Mark Doliner2014-09-051-1/+1
| * | Fixing android.text.format.Time for non-English localesNeil Fuller2014-08-291-78/+59
| |/
| * Switch TextUtils over to new ICU API.Narayan Kamath2014-07-311-1/+1
| * Rewriting android.text.format.Time without the native _tz functionsNeil Fuller2014-07-222-115/+1081
* | Up/down arrow moves to beginning/end of bufferRaph Levien2014-09-041-2/+11
* | Fix Layout.isRtlCharAtRaph Levien2014-09-041-4/+3
* | Merge "Fixing android.text.format.Time for non-English locales" into lmp-devNeil Fuller2014-08-291-78/+59
|\ \
| * | Fixing android.text.format.Time for non-English localesNeil Fuller2014-08-291-78/+59
* | | Ignore width of trailing whitespace for computing ellipsisRaph Levien2014-08-281-2/+8
* | | Fixed spelling of android.nominative and updated some comments.Niels Egberts2014-08-211-186/+165
* | | Make LeadingMarginSpan2 behavior more consistentAnish Athalye2014-08-143-25/+40
* | | Add API for obtaining max text length for accessibilityAlan Viverette2014-08-121-4/+10
* | | Simplify generics, and make Builder concrete.Niels Egberts2014-08-011-2/+2
* | | Switch TextUtils over to new ICU API.Narayan Kamath2014-07-311-1/+1
* | | Fix bug in measurement of paragraphsAnish Athalye2014-07-251-3/+13
|/ /
* | Rewriting android.text.format.Time without the native _tz functionsNeil Fuller2014-07-242-115/+1081
* | New TtsSpan builders for money, electronic and telephone.Niels Egberts2014-07-211-3/+211
* | Merge "Add money as a new TtsSpan type." into lmp-devNiels Egberts2014-07-171-9/+45
|\ \
| * | Add money as a new TtsSpan type.Niels Egberts2014-07-181-9/+45
* | | New TtsSpan builders for types measure, time, date, digits and verbatim.Niels Egberts2014-07-181-0/+315
* | | Add builders for TtsSpans of type ordinal, decimal and fraction.Niels Egberts2014-07-181-10/+269
|/ /
* | TtsSpan builders for each TtsSpan type. DO NOT MERGENiels Egberts2014-07-171-4/+228
* | New convenience method that takes a CharSequence and an Object as theNiels Egberts2014-07-111-0/+15
* | Add more semiotic class types for TtsSpan.Niels Egberts2014-07-101-25/+333
* | Add TtsSpan class.Niels Egberts2014-07-072-1/+158
* | Merge "Fix line breaking for clusters in narrow views"Anish Athalye2014-07-011-5/+14
|\ \
| * | Fix line breaking for clusters in narrow viewsAnish Athalye2014-07-011-5/+14
* | | Add support for mouse-based text selection.Sujith Ramakrishnan2014-07-012-16/+78
|/ /
* | Implement line breaking using ICU break iteratorAnish Athalye2014-06-301-106/+17
* | Clean up dirFlags / bidiFlags confusionRaph Levien2014-06-164-32/+29
* | am 2ecc4dc8: am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU ap...Narayan Kamath2014-06-161-1/+1
|\ \
| * \ am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis."Narayan Kamath2014-06-161-1/+1
| |\ \ | | |/
| | * Track changes to libcore ICU apis.Narayan Kamath2014-06-121-1/+1
* | | am 7d8b87f0: Merge "Fix a CTS test" into lmp-preview-devJean Chalard2014-06-121-17/+1
|\ \ \
| * | | Fix a CTS testJean Chalard2014-06-111-17/+1
* | | | am 44195b4f: am 42c53fd6: Merge "Catch OperationUnsupportedException when lin...Justin Koh2014-06-111-23/+30
|\ \ \ \ | | |/ / | |/| |