summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
Commit message (Expand)AuthorAgeFilesLines
* am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" i...Raph Levien2014-12-171-2/+2
|\
| * 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
* | | Revert "Fix missing ellipsis when just one character is truncated"Raph Levien2014-12-121-1/+3
* | | am 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALI...Raph Levien2014-12-091-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
* | | | resolved conflicts for merge of b9d21d62 to masterRaph Levien2014-12-081-2/+1
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aospJorim Jaggi2014-11-251-4/+28
|\ \ \ | |/ /
| * | 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 43395d67: am 68e9af7b: am 1d84709c: Merge "Stop reading Settings.System.DA...Narayan Kamath2014-11-241-63/+10
|\ \ \ | |/ /
| * | 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
* | | | Fix missing ellipsis when just one character is truncatedRaph Levien2014-11-191-3/+1
* | | | am 34c45bb9: am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to ne...Adrian Roos2014-11-061-0/+21
|\ \ \ \ | |/ / /
| * | | 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 f2196a6e: am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat AP...Narayan Kamath2014-11-041-15/+53
|\ \ \ \ | |/ / /
| * | | 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
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
* | | | | | | | am a021e922: resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-241-0/+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
| | | |_|_|/ / | | |/| | | |
* | | | | | | Migrate off timeFormat12 and timeFormat24.Elliott Hughes2014-10-231-1/+1
* | | | | | | Merge "Add Optimized Line breaking to LayoutLib"Deepanshu Gupta2014-10-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add Optimized Line breaking to LayoutLibDeepanshu Gupta2014-10-211-1/+1
* | | | | | | | am 8ee06212: am 1802567a: am e4625cc1: Merge "Fix Time docs to document vario...Neil Fuller2014-10-151-3/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | 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
* | | | | | am c2a0b448: resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-021-3/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | | |/ / | | |/| |
* | | | | Fix some documentation typos.Newton Allen2014-09-301-3/+3
generated by cgit v1.1 at 2025-03-13 21:47:51 +0000