summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
Commit message (Expand)AuthorAgeFilesLines
* am 46c95313: am ddb30cd3: am 7506f499: Merge "Fix to crash when clicking text...Alan Viverette2015-03-251-1/+7
|\
| * Merge "Fix to crash when clicking text link without view activity"Alan Viverette2015-03-251-1/+7
| |\
| | * Fix to crash when clicking text link without view activityDaniel 2 Olofsson2014-12-101-1/+7
* | | Make Html#toHTML() generate correct bidi directions.Roozbeh Pournader2015-03-231-7/+9
* | | Replace usages of deprecated Resources.getColor() and getColorStateList()Alan Viverette2015-03-181-1/+1
* | | Merge "Improve undo support for text entered with IME"James Cook2015-03-181-0/+19
|\ \ \
| * | | Improve undo support for text entered with IMEJames Cook2015-03-181-0/+19
* | | | am 17eda7d0: am 4d907643: Merge "Frameworks/base: Fix trivial equals implemen...Andreas Gampe2015-03-171-4/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Frameworks/base: Fix trivial equals implementationAndreas Gampe2015-03-171-4/+0
* | | Start moving text measurement into native codeRaph Levien2015-03-134-29/+99
* | | Fix android.text.cts.StaticLayoutTest#testGetEllipsisCountRaph Levien2015-03-111-1/+1
* | | Annotate ARGB integer parameters with @ColorIntTor Norbye2015-03-053-2/+10
* | | Merge "Add JNI StaticLayout.Builder"Raph Levien2015-03-051-4/+36
|\ \ \
| * | | Add JNI StaticLayout.BuilderRaph Levien2015-03-051-4/+36
* | | | Merge "Some refactoring of StaticLayout"Raph Levien2015-03-043-50/+213
|\ \ \ \ | |/ / /
| * | | Some refactoring of StaticLayoutRaph Levien2015-03-043-52/+213
* | | | Remove unused imports in frameworks/base.John Spurlock2015-02-283-4/+0
|/ / /
* | | Merge "Document the limitations of Linkify addresses"Roozbeh Pournader2015-02-251-1/+4
|\ \ \
| * | | Document the limitations of Linkify addressesRoozbeh Pournader2015-02-251-1/+4
* | | | Annotate the parameter in TextUtils#isEmpty() as @NullableScott Kennedy2015-02-191-1/+2
* | | | Add @ResourceInt annotations on APIsTor Norbye2015-02-181-2/+3
* | | | Merge "Interval tree for SpannableStringBuilder"Raph Levien2015-02-121-189/+361
|\ \ \ \
| * | | | Interval tree for SpannableStringBuilderRaph Levien2015-02-121-189/+361
* | | | | resolve merge conflicts of 6d8886a to master.Tao Bao2015-02-121-139/+15
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | 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
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | 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 605ba802: am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activitie...Svet Ganov2015-01-161-0/+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
* | | | Add @Nullable annotation where necessary in Rfc822TokenScott Kennedy2015-01-151-4/+10
* | | | 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
|\ \ \ \ | |/ / /