summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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 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 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 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 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
* | 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
* | resolved conflicts for merge of a35ec14f to masterElliott Hughes2013-07-251-452/+13
|\ \ | |/
| * Switch DateUtils.formatDateRange over to an icu4c-based implementation.Elliott Hughes2013-07-241-452/+13
* | Merge "Fix bug #9073962 - Carret is still on the left with an empty EditText ...Fabrice Di Meglio2013-06-191-1/+3
|\ \
| * | Fix bug #9073962 - Carret is still on the left with an empty EditText in Arab...Fabrice Di Meglio2013-06-191-1/+3
* | | am 8303a203: am 94ba190e: am de04dfb6: Merge "some extra docs for TextDirecti...Scott Main2013-06-172-3/+16
|\ \ \ | | |/ | |/|
| * | am 94ba190e: am de04dfb6: Merge "some extra docs for TextDirectionHeuristic" ...Scott Main2013-06-172-3/+16
| |\ \
| | * | some extra docs for TextDirectionHeuristicScott Main2013-06-172-3/+16
* | | | am 704dfbfe: am 48fa06f3: am f6a67139: Merge "Correct Date format for el_GR, ...Elliott Hughes2013-06-171-7/+3
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"Elliott Hughes2013-06-171-7/+3
| |\ \
| | * | Correct Date format for el_GR, sv_SE and tr_TR localeshowardb2013-06-171-7/+3
* | | | am 38272ad2: am 21403857: Merge "Fix for bug 8911390 RTL text alignment is ch...Raph Levien2013-05-151-1/+3
|\ \ \ \ | |/ / /
| * | | am 21403857: Merge "Fix for bug 8911390 RTL text alignment is changed ..." in...Raph Levien2013-05-151-1/+3
| |\ \ \ | | | |/ | | |/|
| | * | Fix for bug 8911390 RTL text alignment is changed ...Raph Levien2013-05-141-1/+3
* | | | Merge "enable selection of Linkify-annotated text"Victoria Lease2013-05-071-0/+5
|\ \ \ \
| * | | | enable selection of Linkify-annotated textVictoria Lease2013-04-291-0/+5
* | | | | am c2639e58: am 0bb4c701: Merge "Use ICU for getDateFormatOrder."Elliott Hughes2013-04-301-28/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 0bb4c701: Merge "Use ICU for getDateFormatOrder."Elliott Hughes2013-04-301-28/+2
| |\ \ \ | | |/ / | |/| / | | |/
| | * Use ICU for getDateFormatOrder.Elliott Hughes2013-04-301-28/+3
* | | am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bi...Fabrice Di Meglio2013-04-201-260/+13
|\ \ \ | |/ /
| * | Fix bug #8656546 API REVIEW: android.text.bidi / android.textFabrice Di Meglio2013-04-191-260/+13
* | | am 7e170b63: am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableS...Victoria Lease2013-04-201-3/+17
|\ \ \ | |/ /
| * | do not attempt to parcel unknown ParcelableSpansVictoria Lease2013-04-191-3/+17
* | | am 4febbf35: am bd286426: Merge "Fix bug #8599905 Add simple BidiFormatter ge...Fabrice Di Meglio2013-04-111-0/+8
|\ \ \ | |/ /