summaryrefslogtreecommitdiffstats
path: root/text
Commit message (Collapse)AuthorAgeFilesLines
* Small changes missed in the original submission of 22482.Jesse Wilson2009-08-252-2/+2
|
* Update java.text to Harmony r802921.Jesse Wilson2009-08-2437-1685/+2108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notable changes: - Replaced some StringBuffers with StringBuilders - Harmony moved to ICU, we stayed with ResourceBundles - Harmony now uses ICU's Bidi, we continue to use BidiWrapper - Fixed DateFormat.readResolve() - Fixed DecimalFormat serialization for setMaximumIntegerDigits - Fixed currency to support "XXX" for null - Support for null in MessageFormat.format() - Rearranged methods in SimpleDateFormat. Body is the same. - Fixed tests for Bidi.getRunLimit(). These are new failures. commit 112ab830475bc1a1fab9c7a16589b5525892e6a0 Merge: 39b03a1 62c2b2e Author: Jesse Wilson <jessewilson@google.com> Date: Mon Aug 24 14:03:31 2009 -0700 Merge dalvik and Harmony for java.text Conflicts: libcore/text/.classpath libcore/text/META-INF/MANIFEST.MF libcore/text/build.xml libcore/text/make/exclude.common libcore/text/make/run-test.xml libcore/text/src/main/java/java/text/Annotation.java libcore/text/src/main/java/java/text/AttributedCharacterIterator.java libcore/text/src/main/java/java/text/AttributedString.java libcore/text/src/main/java/java/text/Bidi.java libcore/text/src/main/java/java/text/BreakIterator.java libcore/text/src/main/java/java/text/CharacterIterator.java libcore/text/src/main/java/java/text/ChoiceFormat.java libcore/text/src/main/java/java/text/CollationElementIterator.java libcore/text/src/main/java/java/text/CollationKey.java libcore/text/src/main/java/java/text/Collator.java libcore/text/src/main/java/java/text/DateFormat.java libcore/text/src/main/java/java/text/DateFormatSymbols.java libcore/text/src/main/java/java/text/DecimalFormat.java libcore/text/src/main/java/java/text/DecimalFormatSymbols.java libcore/text/src/main/java/java/text/FieldPosition.java libcore/text/src/main/java/java/text/Format.java libcore/text/src/main/java/java/text/MessageFormat.java libcore/text/src/main/java/java/text/NumberFormat.java libcore/text/src/main/java/java/text/ParseException.java libcore/text/src/main/java/java/text/ParsePosition.java libcore/text/src/main/java/java/text/RuleBasedCollator.java libcore/text/src/main/java/java/text/SimpleDateFormat.java libcore/text/src/main/java/java/text/StringCharacterIterator.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java commit 39b03a1b2b150d468cc15d8ff8a92a07c9098a5c Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 19 17:00:36 2009 -0700 text_dalvik commit 62c2b2e932da51858998820fe2558631999c1241 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 19 17:00:23 2009 -0700 text_802921 commit 2da8bc3457b9db827d96652e2bf159b7d5040ad1 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 19 17:00:08 2009 -0700 text_527399
* am ac02d18: am 2de2459: AI 148670: More tests that need to be marked broJorg Pleumann2009-05-111-0/+2
|\ | | | | | | | | | | | | Merge commit 'ac02d185cf7f5b494c621ca67a4d786348deac3a' * commit 'ac02d185cf7f5b494c621ca67a4d786348deac3a': AI 148670: More tests that need to be marked broken, since
| * AI 148670: More tests that need to be marked broken, sinceJorg Pleumann2009-05-111-0/+2
| | | | | | | | | | | | | | | | they behave differently in CTS and plain VM. Hopefully the last ones... BUG=1285921 Automated import of CL 148670
* | am d26d3fc: am 3fb3946: AI 147687: Several fixes for failing tests in thUrs Grob2009-04-293-0/+17
|\ \ | |/ | | | | | | | | | | Merge commit 'd26d3fc95151c78102bc7bff12bb4b099424fd3f' * commit 'd26d3fc95151c78102bc7bff12bb4b099424fd3f': AI 147687: Several fixes for failing tests in the cts host. also tests that timeout
| * AI 147687: Several fixes for failing tests in the cts host. also tests that ↵Urs Grob2009-04-243-0/+17
| | | | | | | | | | | | | | | | | | | | timeout are now marked with BrokenTest to exclude them for the time being until we have a way to execute them. BUG=1285921 Automated import of CL 147687
| * AI 145289: Fixes for tests in the text module.Urs Grob2009-04-094-0/+14
| | | | | | | | | | | | | | Some tests are still failing in the cts host environment. this CL fixes most of them for the test module. BUG=1285921 Automated import of CL 145289
| * AI 143456: Bringing the text tests down to zero failures.Jorg Pleumann2009-03-302-0/+4
| | | | | | | | | | | | BUG=1285921 Automated import of CL 143456
* | AI 145650: am: CL 145613 am: CL 145289 Fixes for tests in the text module.Urs Grob2009-04-094-0/+14
| | | | | | | | | | | | | | | | | | Some tests are still failing in the cts host environment. this CL fixes most of them for the test module. Original author: ursg Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145650
* | AI 143668: am: CL 143635 am: CL 143456 Bringing the text tests down to zero ↵Jorg Pleumann2009-03-312-0/+4
| | | | | | | | | | | | | | | | | | | | | | failures. Original author: jorgp Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143668
* | auto import //branches/master/...@140412The Android Open Source Project2009-03-181-1/+1
|/
* auto import from //branches/cupcake/...@137873The Android Open Source Project2009-03-116-56/+54
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0362-0/+30943
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0362-30943/+0
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-105-31/+100
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-0931-4838/+5167
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1755-1867/+9854
|
* Initial ContributionThe Android Open Source Project2008-10-2161-0/+22558
generated by cgit v1.1 at 2025-01-10 20:04:43 +0000