330 Commits

Author SHA1 Message Date
Neal Nguyen
ae46195d4f Framework Tests Cleanup: Removing CTS duplicate files
This file is basically just a wrapper around AndroidTest, which is going away as part of framework test cleanup.

AndroidTests.java is just a wrapper around all the actual tests, so can be removed as well.
2010-01-04 12:23:56 -08:00
Tom Taylor
f0108cda21 resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
2009-12-22 10:11:55 -08:00
Jean-Baptiste Queru
5237f019b9 am c4978805: merge from open-source master
Merge commit 'c4978805dc8837570701629a9b8098e80804ad34'

* commit 'c4978805dc8837570701629a9b8098e80804ad34':
  ImageButton example doesn't work. Default state should be at the last.
  Time.parse3339 range checking and proper 'sec-frac' skip
2009-12-21 15:52:57 -08:00
Tom Taylor
ad2fa35d88 am d4a4729c: Update imports to android-common
Merge commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0' into eclair-mr2-plus-aosp

* commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0':
  Update imports to android-common
2009-12-21 15:44:34 -08:00
Tom Taylor
d4a4729c0c Update imports to android-common
Several files were moved to android-common. Update all the references
to import those files from the new location.
2009-12-21 13:59:18 -08:00
Paul Westbrook
b8d4698818 Bug 2330278
Deleted old copy of SimplePullParser, since it has been moved to
gdata
2009-12-17 10:47:17 -08:00
Paul Westbrook
01dde47ea9 Bug 2326468
Deleted old copy of the GoogleHttpClient, and the unit tests.
2009-12-15 14:26:13 -08:00
Paul Westbrook
e143bc92b2 resolved conflicts for merge of 15d3bb2c to master 2009-12-14 10:56:45 -08:00
Paul Westbrook
15d3bb2ce6 am 7762d936: Unbundling work
Merge commit '7762d93621f508f4410fd37b5bbdfec0071b0420' into eclair-mr2-plus-aosp

* commit '7762d93621f508f4410fd37b5bbdfec0071b0420':
  Unbundling work
2009-12-14 10:10:20 -08:00
Paul Westbrook
7762d93621 Unbundling work
Moved AndroidHttpClient, Rfc822InputFilter, Rfc822Validator
NumberPicker, NumberPickerButton to android-common
---
2009-12-14 09:24:09 -08:00
Dan Egnor
d021302134 resolved conflicts for merge of f6bb01b0 to master 2009-12-11 14:55:24 -08:00
Dan Egnor
f6bb01b0d8 am b7f0367c: Eliminate CrashData and friends.
Merge commit 'b7f0367cec1c744aa66ef397b0244e25d507491c' into eclair-mr2-plus-aosp

* commit 'b7f0367cec1c744aa66ef397b0244e25d507491c':
  Eliminate CrashData and friends.
2009-12-11 14:32:40 -08:00
Dan Egnor
b7f0367cec Eliminate CrashData and friends.
(CrashData was a custom-marshalled crash-info class used for a server crash
reporting system I am deprecating).  Use ApplicationErrorReport.CrashInfo
instead to report crash details (mostly the stack trace) from RuntimeInfo to
ActivityManagerService, since we're likely to need the crash information in
that form anyway.

Remove the (long-disabled) flags and support for the "Debug" button
in the crash dialog.

Further gut the ICheckinService interface by removing the crash-reporting
APIs (and everything that calls them), plus the synchronous checkin()
method (which has been stubbed out for a while now).

A new dropbox-based crash reporting system is in the works, but not part
of this change.
2009-12-11 13:27:04 -08:00
Wink Saville
7a4fb7376b am 595c4092: am 8fb0faf3: Merge change I0a56959e into eclair-mr2
Merge commit '595c40920f31ba7b6674eb341548173e2aaf6ea7'

* commit '595c40920f31ba7b6674eb341548173e2aaf6ea7':
  Implement a HierarchicalStateMachine
2009-12-11 01:40:43 -08:00
Wink Saville
595c40920f am 8fb0faf3: Merge change I0a56959e into eclair-mr2
Merge commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c' into eclair-mr2-plus-aosp

* commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c':
  Implement a HierarchicalStateMachine
2009-12-10 21:24:59 -08:00
Android (Google) Code Review
8fb0faf3cc Merge change I0a56959e into eclair-mr2
* changes:
  Implement a HierarchicalStateMachine
2009-12-10 21:22:19 -08:00
Fred Quintana
2ec6c56991 am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c
Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp

* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
  - removed the concept of Entity from the ContentProvider APIs
2009-12-10 10:37:52 -08:00
Fred Quintana
3d2560ad92 am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c
Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp

* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
  - removed the concept of Entity from the ContentProvider APIs
2009-12-09 16:00:31 -08:00
Fred Quintana
328c0e7986 - removed the concept of Entity from the ContentProvider APIs
- removed the parcelling ability from Entity and EntityIterator and made them public
- added an EntityIterator abstract implementation that allow easy wrapping of a Cursor
- changed the VCard code to use the new APIs
2009-12-09 10:30:18 -08:00
Wink Saville
fc5b4802a5 Implement a HierarchicalStateMachine
A hierarchical state machine is a state machine which processes messages
and can have states arranged hierarchically. Each state in the state
machine may have a single parent state and if a child state is unable to
handle a message it may have the message processed by its parent.

Change-Id: I0a56959ece8f89e4f9122dc8044120b82d517bbb
2009-12-08 21:22:24 -08:00
Bjorn Bringert
c5303c3a55 am 8d962613: am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '8d962613464b206f4c0b2323607c5e248543ad24'

* commit '8d962613464b206f4c0b2323607c5e248543ad24':
  Move android.server.search.SearchableInfo to android.app
2009-12-07 14:58:38 -08:00
Bjorn Bringert
8d96261346 am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '6dba0680cd3bc0bd987a3d01fc49421897528f20' into eclair-mr2-plus-aosp

* commit '6dba0680cd3bc0bd987a3d01fc49421897528f20':
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:26:04 -08:00
Bjorn Bringert
2126aac7f9 Move android.server.search.SearchableInfo to android.app
We need to expose SearchableInfo in the SDK in order to unbundle
Quick Search Box. Since the android.server.search package is
hidden, I'm moving SearchableInfo to android.app, where
SearchManager lives.

This change doesn't actually expose SearchableInfo. I'll do
that in a separate change to keep the change that
api-council needs to review small.

This is part of the fix for: http://b/issue?id=2270838

Change-Id: I9589f9c2c11d36c958beedff8245fe0c3319c6ba
2009-12-04 12:52:51 +00:00
Dan Egnor
f3ab5c6b32 am 86ef717e: am 99cee031: Merge change Ieb7a7d57 into eclair-mr2
Merge commit '86ef717e2660dbc914dcf68295fbf9943c45bc44'

* commit '86ef717e2660dbc914dcf68295fbf9943c45bc44':
  Change the DropBoxManager API slightly (this is public, but not yet released) --
2009-11-25 13:11:59 -08:00
Dan Egnor
86ef717e26 am 99cee031: Merge change Ieb7a7d57 into eclair-mr2
Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp

* commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365':
  Change the DropBoxManager API slightly (this is public, but not yet released) --
2009-11-25 13:04:19 -08:00
Dan Egnor
eb7a7d57ca 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.)
2009-11-25 12:38:00 -08:00
Fred Quintana
5bb9771ec7 resolved conflicts for merge of b8675943 to master 2009-11-24 11:39:32 -08:00
Fred Quintana
b867594323 am 2464acc6: moved the gdata library to vendor/google
Merge commit '2464acc6da6393f0163894094468f68b8e496cea' into eclair-mr2-plus-aosp

* commit '2464acc6da6393f0163894094468f68b8e496cea':
  moved the gdata library to vendor/google
2009-11-24 11:03:05 -08:00
Fred Quintana
2464acc6da moved the gdata library to vendor/google 2009-11-24 10:42:00 -08:00
Daisuke Miyakawa
7fee29dafd am 4ee476ef: am 5e332efd: Merge change I903ce7b1 into eclair-mr2
Merge commit '4ee476ef94f7834c18ee378c788abcdb0728954f'

* commit '4ee476ef94f7834c18ee378c788abcdb0728954f':
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:23:38 -08: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
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
Daisuke Miyakawa
3b90f65c02 am 23eb8223: am 4f81eac4: Merge change I27b1bb90 into eclair-mr2
Merge commit '23eb822369952931935589a8b838929b4c044fba'

* commit '23eb822369952931935589a8b838929b4c044fba':
  Refactor vCard test code and modify unit tests.
2009-11-19 18:59:09 -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
35e3d527d3 am 1b3a7b43: am eb114de5: Merge change I639b0f03 into eclair-mr2
Merge commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5'

* commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5':
  Make vCard exporter append neighborhood to locality field instead of extended address,
2009-11-19 17:42:27 -08: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
b0a12a151f am e922751e: am 6a942dbe: Merge change Ifd754059 into eclair-mr2
Merge commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808'

* commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808':
  Make vCard code refrain from using NEIGHBORHOOD field when importing.
2009-11-18 18:30:40 -08: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
f4d7ffb0b1 am 5b2f5ced: am ddd017f8: Merge change I8daabf26 into eclair-mr2
Merge commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8'

* commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8':
  Modify vCard exporter code so that it does not emit non-Ascii type.
2009-11-18 17:54:44 -08: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
20fbb79825 resolved conflicts for merge of a351b7f0 to master 2009-11-18 13:43:10 -08: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
0f3bd555b9 am 355c4bc3: am a3dbee32: Merge change I919c20bb into eclair-mr2
Merge commit '355c4bc31c350030a636f7a864cdcd863e71eae9'

* commit '355c4bc31c350030a636f7a864cdcd863e71eae9':
  Code clean up.
2009-11-18 11:57:29 -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