669 Commits

Author SHA1 Message Date
Ben Murdoch
c26197e02c am 7caaeecc: Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
Merge commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0' into eclair-mr2-plus-aosp

* commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
2009-11-20 02:20:02 -08:00
Ben Murdoch
7caaeecce1 Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
BUG=b/2271636

Change-Id: Ia9bed430c624c4c3745904c98fb2e27632d929f9
2009-11-20 10:14:46 +00:00
Daisuke Miyakawa
4ee476ef94 am 5e332efd: Merge change I903ce7b1 into eclair-mr2
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.
2009-11-19 23:19:32 -08:00
Android (Google) Code Review
5e332efd56 Merge change I903ce7b1 into eclair-mr2
* changes:
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:14:37 -08:00
Daisuke Miyakawa
a750fdd765 Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Internal issue number: 2195990
2009-11-20 16:13:07 +09:00
Joe Onorato
e627a75974 am 50b69062: am 57bda83d: Merge change I4f614c9e into eclair
Merge commit '50b690625b4dd37475d6966f9037801b2ddde5f8' into eclair-mr2-plus-aosp

* commit '50b690625b4dd37475d6966f9037801b2ddde5f8':
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 21:25:07 -08:00
Joe Onorato
50b690625b am 57bda83d: Merge change I4f614c9e into eclair
Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-mr2

* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 21:20:18 -08:00
Joe Onorato
4f614c9efb Add a test app that has 100 icons. None of them do anything when clicked. 2009-11-19 20:15:27 -08:00
Daisuke Miyakawa
23eb822369 am 4f81eac4: Merge change I27b1bb90 into eclair-mr2
Merge commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09' into eclair-mr2-plus-aosp

* commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09':
  Refactor vCard test code and modify unit tests.
2009-11-19 18:54:32 -08:00
Daisuke Miyakawa
673c1d1fc9 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
2009-11-20 11:18:49 +09:00
Daisuke Miyakawa
1b3a7b433c am eb114de5: Merge change I639b0f03 into eclair-mr2
Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp

* commit 'eb114de5037bba89333bd7d57d305ae989727096':
  Make vCard exporter append neighborhood to locality field instead of extended address,
2009-11-19 14:18:11 -08:00
Daisuke Miyakawa
639b0f032b Make vCard exporter append neighborhood to locality field instead of extended address,
per China convention.

Internal issue number: 2195990
2009-11-20 07:06:40 +09:00
Daisuke Miyakawa
e922751eb6 am 6a942dbe: Merge change Ifd754059 into eclair-mr2
Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp

* commit '6a942dbe51b52ce41903e236d5db294274bb0dd2':
  Make vCard code refrain from using NEIGHBORHOOD field when importing.
2009-11-18 18:26:24 -08:00
Daisuke Miyakawa
a6d81e3ee4 Make vCard code refrain from using NEIGHBORHOOD field when importing.
Internal issue number: 2195990
2009-11-19 11:21:39 +09:00
Daisuke Miyakawa
5b2f5ced25 am ddd017f8: Merge change I8daabf26 into eclair-mr2
Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp

* commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05':
  Modify vCard exporter code so that it does not emit non-Ascii type.
2009-11-18 16:16:33 -08:00
Daisuke Miyakawa
c4b51712d8 Modify vCard exporter code so that it does not emit non-Ascii type.
Also add unit tests.

Internal issue number: 2195990
2009-11-19 09:09:27 +09:00
Dan Egnor
a351b7f0c6 am 8c7d9eab: Merge change Icb1674f1 into eclair-mr2
Merge commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330' into eclair-mr2-plus-aosp

* commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330':
  Create android-common static library which gets included in frameworks.jar,
2009-11-18 13:08:52 -08:00
Dan Egnor
ded0e6447e 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.
2009-11-18 12:05:04 -08:00
Daisuke Miyakawa
355c4bc31c am a3dbee32: Merge change I919c20bb into eclair-mr2
Merge commit 'a3dbee32d1deab72e5bbf17ab34b961fb7ab4182' into eclair-mr2-plus-aosp

* commit 'a3dbee32d1deab72e5bbf17ab34b961fb7ab4182':
  Code clean up.
2009-11-18 11:46:03 -08:00
Daisuke Miyakawa
49c0decf46 Code clean up.
Internal issue number: 2195990
2009-11-18 17:18:53 +09:00
Daisuke Miyakawa
7798d36a46 am d2f813c3: Merge change I60cfe9ce into eclair-mr2
Merge commit 'd2f813c3f85060d42744be2632fed20f520001ee' into eclair-mr2-plus-aosp

* commit 'd2f813c3f85060d42744be2632fed20f520001ee':
  Add unit tests.
2009-11-17 17:41:17 -08:00
Daisuke Miyakawa
839c036444 Add unit tests.
Internal issue number: 2195990
2009-11-18 10:35:39 +09:00
Daisuke Miyakawa
50963b1aa5 am 8c808187: Modify test code a little.
Merge commit '8c808187249f473702e0f4bee2147da292490963' into eclair-mr2-plus-aosp

* commit '8c808187249f473702e0f4bee2147da292490963':
  Modify test code a little.
2009-11-17 01:58:31 -08:00
Daisuke Miyakawa
8c80818724 Modify test code a little.
Internal issue number: 2195990
2009-11-17 18:53:19 +09:00
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
Guang Zhu
640b44a070 am 3b8a1b35: am ea48cd6d: 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.
2009-11-12 10:43:42 -08:00
Guang Zhu
3b8a1b3513 am ea48cd6d: 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.
2009-11-12 10:38:08 -08:00
Guang Zhu
ea48cd6dd4 Use a diff that ignores trailing whitespaces to get by some layout test failures. 2009-11-12 10:18:14 -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
Derek Sollenberger
29c00b0f09 am 521123e0: Merge change I9e28c4ce into eclair-mr2
Merge commit '521123e0ed91348be81d3d754d3ee13ecf454ced' into eclair-mr2-plus-aosp

* commit '521123e0ed91348be81d3d754d3ee13ecf454ced':
  Allow plugins to load java classes from their apk.
2009-11-09 12:45:29 -08: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
Derek Sollenberger
9e28c4ce66 Allow plugins to load java classes from their apk.
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
2009-11-09 14:45:58 -05: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
Joe Onorato
178b6c91bc am c92196f6: am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit 'c92196f6932571ddd8b353dd9c9bb37245e3e2de' into eclair-mr2-plus-aosp

* commit 'c92196f6932571ddd8b353dd9c9bb37245e3e2de':
  Another test for StatusBar test.
2009-11-05 20:37:38 -08:00
Joe Onorato
c92196f693 am c3f3f9a9: Merge change Ie71d9e42 into eclair
Merge commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c' into eclair-mr2

* commit 'c3f3f9a90b7d7f8a9665df9c194cff81d0d1782c':
  Another test for StatusBar test.
2009-11-05 20:28:10 -08:00