summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | am ba1abbba: Merge "Revert "Revert "Take the input device into account for me...Raph Levien2013-09-187-6/+60
| |\ \ | | |/
| | * Revert "Revert "Take the input device into account for meta state""Raph Levien2013-09-187-6/+60
* | | am 21b0c88b: am c540f8e9: Merge "Revert "Take the input device into account f...Raph Levien2013-09-187-60/+6
|\ \ \ | |/ /
| * | am c540f8e9: Merge "Revert "Take the input device into account for meta state...Raph Levien2013-09-187-60/+6
| |\ \ | | |/
| | * Revert "Take the input device into account for meta state"Raph Levien2013-09-187-60/+6
* | | am dcb2c68f: am 7558ec40: Merge "Fix for AIOBE at android.text.AndroidBidi.di...Raph Levien2013-09-121-0/+3
|\ \ \ | |/ /
| * | am 7558ec40: Merge "Fix for AIOBE at android.text.AndroidBidi.directions" int...Raph Levien2013-09-121-0/+3
| |\ \ | | |/
| | * Fix for AIOBE at android.text.AndroidBidi.directionsRaph Levien2013-09-121-0/+3
| | * Fix NPE in DateFormat.is24HourFormat.Elliott Hughes2013-08-161-2/+3
| | * DateUtils should use the user's 12/24-hour preference, not the locale's.Elliott Hughes2013-08-141-1/+7
* | | Add View constructor that supplies a default style resourceAlan Viverette2013-09-091-6/+6
|/ /
* | am 98c9491f: am 39e885dc: Merge "Make MeasuredText.sCached field final"Brian Carlstrom2013-08-291-1/+1
|\ \
| * | Make MeasuredText.sCached field finalBrian Carlstrom2013-08-291-1/+1
* | | am 2a8be3cf: am ecdf20d4: Merge "Fix NPE in DateFormat.is24HourFormat."Elliott Hughes2013-08-161-2/+3
|\ \ \ | |/ /
| * | Fix NPE in DateFormat.is24HourFormat.Elliott Hughes2013-08-161-2/+3
* | | am 8a196065: am 82461951: Merge "DateUtils should use the user\'s 12/24-hour ...Elliott Hughes2013-08-141-1/+7
|\ \ \ | |/ / | | / | |/ |/|
| * DateUtils should use the user's 12/24-hour preference, not the locale's.Elliott Hughes2013-08-141-1/+7
* | Developer option to force RTL layoutAmith Yamasani2013-08-081-2/+6
* | am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should ...Elliott Hughes2013-08-021-1/+1
|\ \ | |/
| * If frameworks wants ASCII casing, it should explicity ask for it.Elliott Hughes2013-08-021-1/+1