Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp
* commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365':
Change the DropBoxManager API slightly (this is public, but not yet released) --
take a File instead of a ParcelFileDescriptor (gets opened internally) --
that way the caller doesn't have to worry about closing their PFD and so on.
(Pretty much 100% of the time the caller will be uploading a file, anyway.)
Merge commit '2464acc6da6393f0163894094468f68b8e496cea' into eclair-mr2-plus-aosp
* commit '2464acc6da6393f0163894094468f68b8e496cea':
moved the gdata library to vendor/google
Merge commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp
* commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7':
Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Merge commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09' into eclair-mr2-plus-aosp
* commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09':
Refactor vCard test code and modify unit tests.
Factor out all the classes previously embedded in VCardTestsBase.java so that readers are able to
look over each file easily and each class explicitly mention the dependency between each other.
Make all the test cases use mVerifier in VCardTestsBase so that verify() call will not be
forgotten. Actually there were three tests found in which verify() was not called.
Internal issue number: 2195990
Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp
* commit 'eb114de5037bba89333bd7d57d305ae989727096':
Make vCard exporter append neighborhood to locality field instead of extended address,
Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp
* commit '6a942dbe51b52ce41903e236d5db294274bb0dd2':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
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 '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.
Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp
* commit '592988d307e8d305ca163c4e58da0fb350054194':
Add unit tests for Japanization and fix several bugs.
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 '452a52968f43c21e9a040009e209df023a34876c' into eclair-mr2-plus-aosp
* commit '452a52968f43c21e9a040009e209df023a34876c':
Make vCard exporter check invalid phone numbers and re-format them if needed.
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
Forgot to do this with previous check in. Now that calculateLength() has
been fixed to match the actual encoding (ie, doesn't support single-segment
EMS), test case needs to be updated.
Fixes b/2244483
Merge commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3' into eclair-mr2-plus-aosp
* commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3':
Add tests for Japanization part of vCard.
Merge commit 'f035b47774aabf7397aec5c5459ac9860ad63bab' into eclair-mr2-plus-aosp
* commit 'f035b47774aabf7397aec5c5459ac9860ad63bab':
Make test compontent support multiple vCard input.
