summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | Fix bug #8599905 Add simple BidiFormatter getInstance() helper APIFabrice Di Meglio2013-04-111-0/+8
* | | am 1e2c967b: am 8712e4cc: Merge "use libphonenumber for Linkify.PHONE_NUMBER"...Victoria Lease2013-04-041-3/+20
|\ \ \ | |/ /
| * | Merge "use libphonenumber for Linkify.PHONE_NUMBER" into jb-mr2-devVictoria Lease2013-04-041-3/+20
| |\ \
| | * | use libphonenumber for Linkify.PHONE_NUMBERVictoria Lease2013-04-041-3/+20
* | | | am 11139563: am dbca824d: Merge "Add DateFormat.getBestDateTimePattern." into...Elliott Hughes2013-04-021-0/+35
|\ \ \ \ | |/ / /
| * | | Add DateFormat.getBestDateTimePattern.Elliott Hughes2013-04-021-0/+35
| |/ /
* | | am 0a914107: am 8fed6bc8: Merge "Make zero width space a line breaker" into j...Raph Levien2013-03-291-1/+2
|\ \ \ | |/ /
| * | Merge "Make zero width space a line breaker" into jb-mr2-devRaph Levien2013-03-291-1/+2
| |\ \
| | * | Make zero width space a line breakerRaph Levien2013-03-291-1/+2
* | | | am 08dbf6a8: am 82718153: am 6f14ef70: am 083bfa5a: Merge "Remove dead DateUt...Elliott Hughes2013-03-262-116/+17
|\ \ \ \ | |/ / /
| * | | am 6f14ef70: am 083bfa5a: Merge "Remove dead DateUtils code that was never in...Elliott Hughes2013-03-262-116/+17
| |\ \ \ | | |/ / | |/| / | | |/
| | * Remove dead DateUtils code that was never in an API level.Elliott Hughes2013-03-262-116/+17
* | | am 0bcec06b: am 19eceaad: Merge "Fix bug #8437358 Clean any ICU related code ...Fabrice Di Meglio2013-03-202-36/+0
|\ \ \ | |/ /
| * | Merge "Fix bug #8437358 Clean any ICU related code from TextLayout / Paint an...Fabrice Di Meglio2013-03-202-36/+0
| |\ \
| | * | Fix bug #8437358 Clean any ICU related code from TextLayout / Paint and their...Fabrice Di Meglio2013-03-202-36/+0
* | | | am 96112802: am 80828f46: am c1562075: am ebebb80b: Merge "Remove dead code f...Elliott Hughes2013-03-191-82/+0
|\ \ \ \ | |/ / /
| * | | am c1562075: am ebebb80b: Merge "Remove dead code from DateUtils."Elliott Hughes2013-03-191-82/+0
| |\ \ \ | | | |/ | | |/|
| | * | Remove dead code from DateUtils.Elliott Hughes2013-03-191-82/+0
* | | | am 110a98b6: am f7c01e5a: am eda35cb7: am a8974d3f: Merge "Clean up (some of)...Elliott Hughes2013-03-191-2/+11
|\ \ \ \ | |/ / /
| * | | am eda35cb7: am a8974d3f: Merge "Clean up (some of) our many clocks to use H ...Elliott Hughes2013-03-191-2/+11
| |\ \ \ | | |/ /
| | * | Clean up (some of) our many clocks to use H instead of k.Elliott Hughes2013-03-181-2/+11
* | | | am 561a0ef4: am c3e513e5: am c5c6d416: am 6317315e: Merge "Deliberately break...Elliott Hughes2013-03-191-7/+20
|\ \ \ \ | |/ / /
| * | | am c5c6d416: am 6317315e: Merge "Deliberately break DateFormat.format\'s form...Elliott Hughes2013-03-191-7/+20
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Deliberately break DateFormat.format's formatting of 'k' for compatibility.Elliott Hughes2013-03-181-7/+20
* | | am cf60cc9a: am 261f82ca: Merge "Revert "Clean Paint.mBidiFlags as it is no l...Fabrice Di Meglio2013-03-154-35/+72
|\ \ \ | |/ /
| * | Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-devFabrice Di Meglio2013-03-154-35/+72
| |\ \
| | * | Revert "Clean Paint.mBidiFlags as it is no longer used"Fabrice Di Meglio2013-03-154-35/+72
* | | | am fc8865d8: am b1b58023: Merge "Code BidiFormatter code" into jb-mr2-devFabrice Di Meglio2013-03-141-38/+38
|\ \ \ \ | |/ / /
| * | | Code BidiFormatter codeFabrice Di Meglio2013-03-141-38/+38
| |/ /
* | | Take the input device into account for meta stateJean Chalard2013-03-127-6/+60
* | | Merge "Preparatory cleanups in MetaKeyKeyListener"Jean Chalard2013-03-121-12/+16
|\ \ \ | |/ / |/| |
| * | Preparatory cleanups in MetaKeyKeyListenerJean Chalard2013-03-041-12/+16
* | | am a45bafc2: am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and ...Elliott Hughes2013-03-111-7/+19
|\ \ \ | | |/ | |/|
| * | Fix DateFormat k and h, and implement K and H for the first time.Elliott Hughes2013-03-111-7/+19
* | | am 7c1e8dbd: am 21d3f294: Merge "use Calendar in DateUtils format method"Elliott Hughes2013-03-111-10/+28
|\ \ \ | |/ /
| * | use Calendar in DateUtils format methodSungmin Choi2013-03-111-10/+28
* | | am 2cb314eb: am e0cd3c19: Merge "Improve DateFormat.format."Elliott Hughes2013-03-082-247/+114
|\ \ \ | |/ /