Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp
* commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05':
Modify vCard exporter code so that it does not emit non-Ascii type.
Merge commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330' into eclair-mr2-plus-aosp
* commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330':
Create android-common static library which gets included in frameworks.jar,
but can also be used by unbundled apps. Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
Merge commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb'
* commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb':
Clean up codes and remove/modify stale codes/comments.
Merge commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c'
* commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c':
Split vCard composer into two parts: VCardComposer and VCardBuilder.
Merge commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509'
* commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509':
Rename several files so that readers would not be confused.
Merge commit '8c808187249f473702e0f4bee2147da292490963' into eclair-mr2-plus-aosp
* commit '8c808187249f473702e0f4bee2147da292490963':
Modify test code a little.
Merge commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5' into eclair-mr2-plus-aosp
* commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5':
Clean up codes and remove/modify stale codes/comments.
Merge commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb' into eclair-mr2-plus-aosp
* commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb':
Split vCard composer into two parts: VCardComposer and VCardBuilder.
As for VCardBuilder, there was a class with the same name, but this implementation is fundamentally different.
This time, VCardBuilder is like StringBuilder. It enables developers to create their own vCard by themselves.
Make Constants public and rename it to VCardConstants.
Internal issue number: 2242528, 2195990
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp
* commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b':
Rename several files so that readers would not be confused.
The parse3339 JNI code doesn't properly do bounds checking on the input String.
These changes do some bounds checking to prevent a buffer underflow condition.
parse3339 should allow the fractional seconds to be optional and an arbitrary
length as specified in RFC 3339. This will scan through arbitrary precision
until it finds the timezone indicators.
Change-Id: Ie9d01d0b24163d893c58c747d37873c83b74e6c7
Merge commit '2a77d4633aae1d04054fb09850d7939aa386b0a0'
* commit '2a77d4633aae1d04054fb09850d7939aa386b0a0':
Add unit tests for Japanization and fix several bugs.
Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp
* commit '592988d307e8d305ca163c4e58da0fb350054194':
Add unit tests for Japanization and fix several bugs.
Merge commit '640b44a070951696bbeb39e0ddac1c7aa861e35d'
* commit '640b44a070951696bbeb39e0ddac1c7aa861e35d':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8' into eclair-mr2-plus-aosp
* commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-mr2
* commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-plus-aosp
* commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c':
Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit 'fbac9bdfd40b0676a914e9dae7bdd26829087cae'
* commit 'fbac9bdfd40b0676a914e9dae7bdd26829087cae':
Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.
Merge commit '0cda59112526c03f3b8be0eb885926b7515df756' into eclair-mr2-plus-aosp
* commit '0cda59112526c03f3b8be0eb885926b7515df756':
Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.
Previous change selected the first ContactValues object even when its name fields are all empty.
This time, vCard composer checks the name fields and skip the object withouth valid name.
One exception is the object with IS_SUPER_PRIMARY flag. If IS_SUPER_PRIMARY flag is set, the object will be
selected even when the object does not have valid name.
Add a unit test for this fix.
Internal issue number: 2252304
Merge commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990'
* commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990':
Make vCard exporter check invalid phone numbers and re-format them if needed.
Merge commit '452a52968f43c21e9a040009e209df023a34876c' into eclair-mr2-plus-aosp
* commit '452a52968f43c21e9a040009e209df023a34876c':
Make vCard exporter check invalid phone numbers and re-format them if needed.
Merge commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf'
* commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf':
Allow plugins to load java classes from their apk.
Merge commit '521123e0ed91348be81d3d754d3ee13ecf454ced' into eclair-mr2-plus-aosp
* commit '521123e0ed91348be81d3d754d3ee13ecf454ced':
Allow plugins to load java classes from their apk.
Merge commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e'
* commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e':
Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
Merge commit '0e983864fca215513de9664573dcc3bbadf41e79' into eclair-mr2-plus-aosp
* commit '0e983864fca215513de9664573dcc3bbadf41e79':
Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
Provide the functions to be called from native code that take
the plugin's location and desired class name and then load that
class from the plugin's apk if it is available.
see http://b/2215696