summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aospTao Bao2015-02-111-139/+15
|\
| * Use ICU for relative time formattingTao Bao2015-02-111-139/+15
| * Avoid static initialization of Layout from TextUtilsNeil Fuller2015-02-063-8/+9
* | am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of ...Neil Fuller2015-02-063-8/+9
|\ \
| * | Avoid static initialization of Layout from TextUtilsNeil Fuller2015-02-063-8/+9
| * | Use constants instead of resources for ellipsis.Igor Viarheichyk2015-01-291-6/+3
* | | am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked....Svet Ganov2015-01-161-0/+3
|\ \ \ | |/ /
| * | Fixing a memory leak: activities are leaked.Svet Ganov2015-01-161-0/+3
* | | am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" i...Raph Levien2014-12-171-2/+2
|\ \ \ | |/ /
| * | Revert "Change Linkify leniency to VALID"Raph Levien2014-12-171-2/+2
* | | am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-m...Raph Levien2014-12-081-2/+2
|\ \ \ | |/ /
| * | Merge "Change Linkify leniency to VALID" into lmp-mr1-devRaph Levien2014-12-051-2/+2
| |\ \
| | * | Change Linkify leniency to VALIDRaph Levien2014-12-041-2/+2
* | | | am 8de4fb2f: am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" int...Raph Levien2014-12-081-2/+6
|\ \ \ \ | |/ / /
| * | | Fix off-by-one error in computeEllipsisRaph Levien2014-12-041-2/+6
| |/ /
* | | resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aospJorim Jaggi2014-11-251-4/+28
|\ \ \ | |/ /
| * | Fixed several time related states for secondary usersSelim Cinek2014-11-211-4/+28
* | | am 68e9af7b: am 1d84709c: Merge "Stop reading Settings.System.DATE_FORMAT."Narayan Kamath2014-11-241-63/+10
|\ \ \ | | |/ | |/|
| * | Stop reading Settings.System.DATE_FORMAT.Narayan Kamath2014-11-241-63/+10
* | | am 22e8e8ef: am bde9ffbd: Merge "Fix missing ellipsis when just one character...Chris Craik2014-11-181-5/+1
|\ \ \ | | |/ | |/|
| * | Fix missing ellipsis when just one character is truncatedRaph Levien2014-11-171-5/+1
* | | am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute"...Adrian Roos2014-11-061-0/+21
|\ \ \ | |/ /
| * | Round charging indication to nearest minuteAdrian Roos2014-11-051-0/+21
* | | am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp...Narayan Kamath2014-11-041-15/+53
|\ \ \ | |/ /
| * | Remove deprecated DateFormat APIs.Narayan Kamath2014-11-031-15/+53
* | | am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."Elliott Hughes2014-10-291-1/+1
|\ \ \ | | |/ | |/|
| * | am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."Elliott Hughes2014-10-281-1/+1
| |\ \
| | * \ Merge "Migrate off timeFormat12 and timeFormat24."Elliott Hughes2014-10-231-1/+1
| | |\ \
| | | * | Migrate off timeFormat12 and timeFormat24.Elliott Hughes2014-10-231-1/+1
| * | | | am 1802567a: am e4625cc1: Merge "Fix Time docs to document various error cases"Neil Fuller2014-10-151-3/+30
| |\ \ \ \ | | |/ / /
| * | | | am d84ce32b: Merge "Fix some documentation typos." into lmp-devNewton Allen2014-10-021-3/+3
| |\ \ \ \
| * \ \ \ \ resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-021-3/+2
| |\ \ \ \ \
| * \ \ \ \ \ am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellip...Elliott Hughes2014-09-191-6/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
* | | | | | | 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
generated by cgit v1.1 at 2024-09-10 21:29:46 +0000