246 Commits

Author SHA1 Message Date
Daisuke Miyakawa
a4d3fae76a am a184d4b9: Merge change I11526e6c into eclair-mr2
Merge commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5' into eclair-mr2-plus-aosp

* commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5':
  Clean up codes and remove/modify stale codes/comments.
2009-11-17 01:07:27 -08:00
Daisuke Miyakawa
d2145b97fb Clean up codes and remove/modify stale codes/comments.
Internal issue number: 2195990
2009-11-17 17:12:54 +09:00
Daisuke Miyakawa
feef7de25b am ac3e2159: Merge change Icaf78440 into eclair-mr2
Merge commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb' into eclair-mr2-plus-aosp

* commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb':
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-16 21:35:19 -08:00
Daisuke Miyakawa
1b9e2bec63 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
2009-11-17 14:30:17 +09:00
Daisuke Miyakawa
d5f787ab28 am 9e807d7c: Merge change Iecf85b40 into eclair-mr2
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp

* commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b':
  Rename several files so that readers would not be confused.
2009-11-16 14:36:17 -08:00
Daisuke Miyakawa
5a1f2d2de0 Rename several files so that readers would not be confused.
Add unit tests around Phone-number handling and fix some bugs.

Internal issue number: 2195990
2009-11-16 16:31:32 +09:00
Daisuke Miyakawa
2a77d4633a am 592988d3: 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.
2009-11-12 19:08:23 -08:00
Daisuke Miyakawa
592988d307 Add unit tests for Japanization and fix several bugs.
Internal issue number: 2195990
2009-11-13 08:33:11 +09:00
Dan Egnor
00556831f7 am f18a01c7: Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
Merge commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f' into eclair-mr2-plus-aosp

* commit 'f18a01c77e78209b74e34d05cfb352fa4a92db5f':
  Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
2009-11-12 14:15:02 -08:00
Dan Egnor
f18a01c77e Rename [I]DropBox[Service] to [I]DropBoxManager[Service].
Un-hide the DropBoxManager interface, and update the public API accordingly.
2009-11-12 13:58:27 -08:00
Daisuke Miyakawa
fbac9bdfd4 am 0cda5911: 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.
2009-11-10 17:14:08 -08:00
Daisuke Miyakawa
0cda591125 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
2009-11-11 10:03:10 +09:00
Daisuke Miyakawa
9e0da5bd2d am 452a5296: Merge change I319bf9ee into eclair-mr2
Merge commit '452a52968f43c21e9a040009e209df023a34876c' into eclair-mr2-plus-aosp

* commit '452a52968f43c21e9a040009e209df023a34876c':
  Make vCard exporter check invalid phone numbers and re-format them if needed.
2009-11-09 16:39:33 -08:00
Daisuke Miyakawa
f2ad61c83d Make vCard exporter check invalid phone numbers and re-format them if needed.
Also add a unit test for the case.

Internal issue number: 2246410
2009-11-10 09:29:04 +09:00
Daisuke Miyakawa
c53cc10390 am 0e983864: Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and "AGENT" line.
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
2009-11-09 12:04:03 -08:00
Daisuke Miyakawa
0e983864fc Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
"AGENT" line.

Internal Issue number: 2247192
2009-11-09 15:34:55 +09:00
jsh
36704bb8ff am 91abf105: am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit '91abf105206f2ba19e886909456b3e3b7ed19362' into eclair-mr2-plus-aosp

* commit '91abf105206f2ba19e886909456b3e3b7ed19362':
  Update CdmaSmsTest unit test.
2009-11-06 13:35:20 -08:00
jsh
91abf10520 am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-mr2

* commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595':
  Update CdmaSmsTest unit test.
2009-11-06 13:23:15 -08:00
jsh
1e1c24bed2 Update CdmaSmsTest unit test.
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
2009-11-06 11:55:19 -08:00
Daisuke Miyakawa
931203d405 am dc0f9efd: Merge change I0d442f0d into eclair-mr2
Merge commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3' into eclair-mr2-plus-aosp

* commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3':
  Add tests for Japanization part of vCard.
2009-11-04 20:57:35 -08:00
Daisuke Miyakawa
4fe2c57c3c Add tests for Japanization part of vCard.
Fix several bugs around name construction.

Internal issue number: 2195990
2009-11-05 13:47:48 +09:00
Daisuke Miyakawa
7557e54700 am 5dbeef6e: Merge change I76588b56 into eclair-mr2
Merge commit '5dbeef6e9844a094f87a3f7d4608b431a6724278' into eclair-mr2-plus-aosp

* commit '5dbeef6e9844a094f87a3f7d4608b431a6724278':
  Make vCard importer handle "PAGER" phone number correctly.
2009-11-04 16:54:20 -08:00
Daisuke Miyakawa
26ee0ae9de Make vCard importer handle "PAGER" phone number correctly.
Add tests for it.

Internal issue number: 2239492
2009-11-05 09:44:42 +09:00
Brett Chabot
dcef5348f4 am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp

* commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 13:23:28 -08:00
Brett Chabot
8742696b0d am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-mr2

* commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 12:05:45 -08:00
Android (Google) Code Review
c20fc77c5a Merge change Iefd4a388 into eclair
* changes:
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 14:56:14 -05:00
Daisuke Miyakawa
ffe9b571bc am f035b477: Make test compontent support multiple vCard input.
Merge commit 'f035b47774aabf7397aec5c5459ac9860ad63bab' into eclair-mr2-plus-aosp

* commit 'f035b47774aabf7397aec5c5459ac9860ad63bab':
  Make test compontent support multiple vCard input.
2009-11-04 05:02:50 -08:00
Daisuke Miyakawa
f035b47774 Make test compontent support multiple vCard input.
Internal issue number: 2195990
2009-11-04 21:51:54 +09:00
Daisuke Miyakawa
32fd3a0043 am 231e01e7: Merge change I202c3106 into eclair-mr2
Merge commit '231e01e7922abae0b33f0aec95275a5cc1b0209d' into eclair-mr2-plus-aosp

* commit '231e01e7922abae0b33f0aec95275a5cc1b0209d':
  Make ContentValuesBuilder a separate file.
2009-11-03 16:22:18 -08:00
Daisuke Miyakawa
9db07dd6b5 Make ContentValuesBuilder a separate file.
Internal issue number: 2195990
2009-11-04 09:10:31 +09:00
Daisuke Miyakawa
7113f59de3 am d14ea3c7: Merge change If338e940 into eclair-mr2
Merge commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4' into eclair-mr2-plus-aosp

* commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4':
  Introduce ContentValuesBuilder and make tests easier to read.
2009-11-03 15:42:06 -08:00
Daisuke Miyakawa
ed2d7c42fc Introduce ContentValuesBuilder and make tests easier to read.
Internal Issue number: 2195990
2009-11-04 08:35:41 +09:00
Daisuke Miyakawa
e7a5141c0d am 66da163d: Move some useful logic to VCardTestsBase.java
Merge commit '66da163d4115688a8be7abb96c409a9858f9a8cd' into eclair-mr2-plus-aosp

* commit '66da163d4115688a8be7abb96c409a9858f9a8cd':
  Move some useful logic to VCardTestsBase.java
2009-11-03 00:04:43 -08:00
Daisuke Miyakawa
66da163d41 Move some useful logic to VCardTestsBase.java
Internal issue number: 2195990
2009-11-03 16:53:58 +09:00
Daisuke Miyakawa
648feb7724 am 3f16be20: Enable vCard tests connect both importer/exporter tests.
Merge commit '3f16be2061ddf8daeed959c6e06db9cf561ae304' into eclair-mr2-plus-aosp

* commit '3f16be2061ddf8daeed959c6e06db9cf561ae304':
  Enable vCard tests connect both importer/exporter tests.
2009-11-01 22:36:02 -08:00
Daisuke Miyakawa
3f16be2061 Enable vCard tests connect both importer/exporter tests.
Fix a bug in ContactStruct.

Internal issue number: 2195990
2009-11-02 15:25:23 +09:00
Jack Wang
af93c05c9a am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair
Merge commit '227ba2072df1474a0b3abaae7c415f152d32bcc2' into eclair-mr2-plus-aosp

* commit '227ba2072df1474a0b3abaae7c415f152d32bcc2':
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-10-30 18:41:08 -07:00
Brett Chabot
efd4a388d6 Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Bug 1840944
2009-10-30 17:45:09 -07:00
Jack Wang
227ba2072d am e8228afb: Merge change I92cdc5ed into eclair
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-10-30 17:07:56 -07:00
Daisuke Miyakawa
d7185d0bd2 am f5633bc7: Fix test breakage in testNickNameV21().
Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp

* commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b':
  Fix test breakage in testNickNameV21().
2009-10-28 23:33:21 -07:00
Daisuke Miyakawa
aa06a0e086 am 3c828e24: Merge change I9195a354 into eclair-mr2
Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp

* commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0':
  Add partial support of Android-specific properties.
2009-10-28 23:32:41 -07:00
Dan Egnor
473bbd2140 am 95240270: Instead of a raw AIDL interface, give DropBox a Java interface (android.os.DropBox); move the Binder interface behind the scenes. Make DropBoxEntry into DropBox.Entry. Make it possible to get a dropbox from an (Application)Context with the usual getSyste
Merge commit '952402704a175ba27f6c89dff1ada634c5ce5626' into eclair-mr2-plus-aosp

* commit '952402704a175ba27f6c89dff1ada634c5ce5626':
  Instead of a raw AIDL interface, give DropBox a Java
2009-10-28 23:32:21 -07:00
Daisuke Miyakawa
f5633bc7e2 Fix test breakage in testNickNameV21().
Internal issue number: 2079082
2009-10-29 12:24:26 +09:00
Android (Google) Code Review
3c828e24a9 Merge change I9195a354 into eclair-mr2
* changes:
  Add partial support of Android-specific properties.
2009-10-28 21:54:29 -04:00
Daisuke Miyakawa
837cba33c5 Add partial support of Android-specific properties.
In the near future, all the values which cannot be converted to
vCard property is expressed as "X-ANDROID-CUSTOM" property + MIME_TYPE.

Example (Nick name):
X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nicky;;;;;;;;;;;;;

All the data are stored ordered by its column name ("data1" - "data15").
Currently the code assumes the max num is 15.

Internal Issue number: 2079082
2009-10-29 09:16:31 +09:00
Dan Egnor
952402704a Instead of a raw AIDL interface, give DropBox a Java
interface (android.os.DropBox); move the Binder interface
behind the scenes.  Make DropBoxEntry into DropBox.Entry.
Make it possible to get a dropbox from an (Application)Context
with the usual getSystemService(DROPBOX_SERVICE) type thing.
Update the tests accordingly.
2009-10-28 15:49:11 -07:00
Jack Wang
075997f12e PerformanceCollector: Collect & report perf measurements in key/value form
- Added new functions to PerformanceCollector and PerformanceResultsWriter
- Modified unit tests to test new functionality and fix flakiness reported in
  2218327 and 2118268
- Added PerformanceCollectorTest to small suite
2009-10-28 14:32:05 -07:00
Brett Chabot
32be57d100 am 622b190c: am b81df8e3: Merge change I5535bbdf into eclair
Merge commit '622b190c878e38468096ef0fe1cd28dbc10c3b33' into eclair-mr2-plus-aosp

* commit '622b190c878e38468096ef0fe1cd28dbc10c3b33':
  Disable flaky and failing tests.
2009-10-28 12:43:52 -07:00
Brett Chabot
622b190c87 am b81df8e3: Merge change I5535bbdf into eclair
Merge commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-mr2

* commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56':
  Disable flaky and failing tests.
2009-10-28 11:37:42 -07:00
Daisuke Miyakawa
1cb34d4850 am bb88e3ad: Move verification code to VCardTestsBase.
Merge commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499' into eclair-mr2-plus-aosp

* commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499':
  Move verification code to VCardTestsBase.
2009-10-26 22:33:57 -07:00