summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
Commit message (Expand)AuthorAgeFilesLines
* am 9777fdb7: am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyL...Jeff Brown2014-05-201-1/+1
|\
| * am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"Jeff Brown2014-05-201-1/+1
| |\
| | * am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"Jeff Brown2014-05-201-1/+1
| | |\
| | | * Merge "Fix NullException in QwertyKeyListener.KeyDown"Jeff Brown2014-05-201-1/+1
| | | |\
| | | | * Fix NullException in QwertyKeyListener.KeyDownDmitry Tsyganyuk2012-08-291-1/+1
* | | | | Merge "Implement better computing of battery drain time, actual charge time."Dianne Hackborn2014-04-291-0/+65
|\ \ \ \ \
| * | | | | Implement better computing of battery drain time, actual charge time.Dianne Hackborn2014-04-291-0/+65
* | | | | | am 3914a33c: am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom...Yuling Liang2014-04-282-10/+10
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Followon fix for 14276128 Clipping at bottom of TextViewRaph Levien2014-04-282-10/+10
* | | | | am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping a...Yuling Liang2014-04-251-10/+6
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Followon fix for 14276128 Clipping at bottom of TextView"Yuling Liang2014-04-251-10/+6
* | | | | am 60f8349b: am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom...Yuling Liang2014-04-251-6/+10
|\ \ \ \ \ | |/ / / /
| * | | | Followon fix for 14276128 Clipping at bottom of TextViewRaph Levien2014-04-241-6/+10
* | | | | am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextV...Raph Levien2014-04-241-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix bug 14276128 Clipping at bottom of TextViewRaph Levien2014-04-231-1/+1
| |/ / /
* | | | Fix extra text appearing after ellipsisRaph Levien2014-04-031-1/+1
* | | | Uses VMRuntime.newUnpaddedArray for ideal array sizesAdam Lesinski2014-03-2711-89/+68
* | | | Tabs -> spaces in frameworks/base.John Spurlock2014-02-2511-101/+101
* | | | Fix a crash where user data was not validated.Jean Chalard2014-02-131-3/+21
* | | | Add APIs for obtaining themed Drawable from Theme, ContextAlan Viverette2014-02-031-1/+1
* | | | am 991ba3b7: am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix t...Scott Main2013-12-181-1/+1
|\ \ \ \ | |/ / /
| * | | am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into ...Scott Main2013-12-171-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docsScott Main2013-12-181-1/+1
| | |\ \
| | | * | fix typosScott Main2013-12-171-1/+1
| | | * | [DO NOT MERGE] Improve documentation for InputType and EditorInfo.Jean Chalard2013-11-131-21/+59
* | | | | Remove unused imports from frameworks/base.John Spurlock2013-11-2010-29/+0
* | | | | am 9ea18d49: am d952ac4c: am 218ecd43: Fix the docs buildJean Chalard2013-11-121-8/+8
|\ \ \ \ \ | |/ / / /
| * | | | am d952ac4c: am 218ecd43: Fix the docs buildJean Chalard2013-11-121-8/+8
| |\ \ \ \ | | |/ / /
| | * | | Fix the docs buildJean Chalard2013-11-131-8/+8
* | | | | am 45637283: am 383ef79d: am 7d57b7a3: Merge "Improve documentation for Input...Jean Chalard2013-11-121-21/+59
|\ \ \ \ \ | |/ / / /
| * | | | am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and Edit...Jean Chalard2013-11-121-21/+59
| |\ \ \ \ | | |/ / /
| | * | | Improve documentation for InputType and EditorInfo.Jean Chalard2013-11-121-21/+59
* | | | | am 24aecc3f: am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html....Victoria Lease2013-11-011-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" int...Victoria Lease2013-11-011-0/+9
| |\ \ \ \ | | |/ / /
| | * | | Handle surrogate pairs in Html.toHtml()Victoria Lease2013-10-291-0/+9
| | |/ /
* | | | am 280d250c: am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashc...Chet Haase2013-10-042-16/+32
|\ \ \ \ | |/ / /
| * | | am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashcode of Spanna...Chet Haase2013-10-042-16/+32
| |\ \ \ | | |/ /
| | * | Merge "Fix infinite recursion in hashcode of Spannables" into klp-devChet Haase2013-10-042-16/+32
| | |\ \
| | | * | Fix infinite recursion in hashcode of SpannablesChet Haase2013-10-042-16/+32
* | | | | am a488c796: am 2a32771a: am 24871f63: Merge "Fix Text appears on top of exis...Raph Levien2013-10-041-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 2a32771a: am 24871f63: Merge "Fix Text appears on top of existing text whe...Raph Levien2013-10-041-3/+5
| |\ \ \ \ | | |/ / /
| | * | | Fix Text appears on top of existing text when composing in gmail.Raph Levien2013-10-031-3/+5
| | |/ /
* | | | am 12618bf7: am 7c1b1087: Merge "Fix for "Can\'t place cursor after combining...Raph Levien2013-09-201-1/+1
|\ \ \ \ | |/ / /
| * | | am 7c1b1087: Merge "Fix for "Can\'t place cursor after combining accent"" int...Raph Levien2013-09-201-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Fix for "Can't place cursor after combining accent"" into klp-devRaph Levien2013-09-201-1/+1
| | |\ \
| | | * | Fix for "Can't place cursor after combining accent"Raph Levien2013-09-201-1/+1
* | | | | am 6736d380: am bdb61865: Merge "Add equals() and hashcode() to SpannableStri...Chet Haase2013-09-202-0/+82
|\ \ \ \ \ | |/ / / /
| * | | | am bdb61865: Merge "Add equals() and hashcode() to SpannableString" into klp-devChet Haase2013-09-202-0/+82
| |\ \ \ \ | | |/ / /
| | * | | Add equals() and hashcode() to SpannableStringChet Haase2013-09-192-0/+82
| | |/ /
* | | | am 954f0d7b: am ba1abbba: Merge "Revert "Revert "Take the input device into a...Raph Levien2013-09-187-6/+60
|\ \ \ \ | |/ / /