775 Commits

Author SHA1 Message Date
Fred Quintana
2c5634198a resolved conflicts for merge of 5a374f94 to master 2009-12-15 15:57:33 -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
Fred Quintana
5a374f94f8 am 274dc9d3: moved the hidden sync helpers out of the framework
Merge commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f' into eclair-mr2-plus-aosp

* commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f':
  moved the hidden sync helpers out of the framework
2009-12-15 05:56:03 -08:00
Fred Quintana
274dc9d35f moved the hidden sync helpers out of the framework 2009-12-14 16:33: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
Jean-Baptiste Queru
80ffd8c5ae resolved conflicts for merge of da9691e9 to master 2009-12-10 15:46:33 -08:00
Adam Powell
da9691e9d6 am 326d808b: Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
Merge commit '326d808b858359464b2ffeb84f2e0a8e0c79b600' into eclair-mr2-plus-aosp

* commit '326d808b858359464b2ffeb84f2e0a8e0c79b600':
  Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
2009-12-10 15:18:43 -08:00
Adam Powell
326d808b85 Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
Reverted a change to InstrumentationTestCase that would have allowed @UiThreadTest on setUp() methods of tests.
2009-12-10 14:49:14 -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
Joe Onorato
df9396a384 am c97c5c0b: am b43b5def: am 0d8055e5: Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit 'c97c5c0b9b61f48cbf47cb95d497e0bb6d01eeef'

* commit 'c97c5c0b9b61f48cbf47cb95d497e0bb6d01eeef':
  Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
2009-12-10 07:53:22 -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
Joe Onorato
c97c5c0b9b am b43b5def: am 0d8055e5: Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit 'b43b5deff30d0ba77ea5b93d3e74507bfe2528be' into eclair-mr2-plus-aosp

* commit 'b43b5deff30d0ba77ea5b93d3e74507bfe2528be':
  Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
2009-12-09 15:52:28 -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
Joe Onorato
b43b5deff3 am 0d8055e5: Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit '0d8055e51ce2666875e14c53e14765f673172b1c' into eclair-mr2

* commit '0d8055e51ce2666875e14c53e14765f673172b1c':
  Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
2009-12-08 14:08:51 -08:00
Joe Onorato
0d8055e51c Paper over 2275704 by not having LotsOfApps installed on the monkeys builds. 2009-12-08 14:02:09 -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
Android (Google) Code Review
6dba0680cd Merge change I9589f9c2 into eclair-mr2
* changes:
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:21:01 -08:00
Romain Guy
a6a0f69363 am a1a68a4a: am 6d72f725: Merge change If32b488b into eclair-mr2
Merge commit 'a1a68a4a2d1b1c48b3dc98638cb2e498b6f65408'

* commit 'a1a68a4a2d1b1c48b3dc98638cb2e498b6f65408':
  Add new unit test for RadioGroup/RadioButton.
2009-12-04 12:07:53 -08:00
Romain Guy
a1a68a4a2d am 6d72f725: Merge change If32b488b into eclair-mr2
Merge commit '6d72f725f18a63afd68f14cc1e2ff8f21d254c77' into eclair-mr2-plus-aosp

* commit '6d72f725f18a63afd68f14cc1e2ff8f21d254c77':
  Add new unit test for RadioGroup/RadioButton.
2009-12-04 11:55:02 -08:00
Romain Guy
f32b488bd2 Add new unit test for RadioGroup/RadioButton.
Also fix the AutoCompleteTextViewCallbacks test.
2009-12-04 11:50:22 -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
Omari Stephens
af08835a95 am 15620b1e: am 21eb1738: am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '15620b1eef1ab1f42c7fbcbfce1f54e0c205df1b'

* commit '15620b1eef1ab1f42c7fbcbfce1f54e0c205df1b':
  Revive backup tests
2009-12-02 20:49:14 -08:00
Guang Zhu
6c03325573 am 26fd3840: am 7dd3337b: Merge change I8179742a into eclair-mr2
Merge commit '26fd38401132ac13cf0c465bcfde27aa3ae989b5'

* commit '26fd38401132ac13cf0c465bcfde27aa3ae989b5':
  Add support for extracting render time and image in page cycler
2009-12-02 20:48:40 -08:00
Omari Stephens
15620b1eef am 21eb1738: am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '21eb173864670c2f759258016d95f0bcd06313e7' into eclair-mr2-plus-aosp

* commit '21eb173864670c2f759258016d95f0bcd06313e7':
  Revive backup tests
2009-12-02 18:32:51 -08:00
Omari Stephens
21eb173864 am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-mr2

* commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
  Revive backup tests
2009-12-02 18:26:05 -08:00
Guang Zhu
26fd384011 am 7dd3337b: Merge change I8179742a into eclair-mr2
Merge commit '7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab' into eclair-mr2-plus-aosp

* commit '7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab':
  Add support for extracting render time and image in page cycler
2009-12-02 18:11:34 -08:00
Guang Zhu
5dc4f21ab6 Add support for extracting render time and image in page cycler 2009-12-02 17:55:18 -08:00
Omari Stephens
aa6e73a6c8 Revive backup tests 2009-12-02 17:39:27 -08:00
Derek Sollenberger
a908fd3a63 am 94c9db54: am c3e20af0: Merge change Ib16749e2 into eclair-mr2
Merge commit '94c9db5485bb36734f10592241cbab060f8f7fb3'

* commit '94c9db5485bb36734f10592241cbab060f8f7fb3':
  Refactoring the logging interface to remove dependence on NPP.
2009-12-01 09:14:42 -08:00
Derek Sollenberger
94c9db5485 am c3e20af0: Merge change Ib16749e2 into eclair-mr2
Merge commit 'c3e20af0b6aed8afe28be5fa08b8d69c6b50f34c' into eclair-mr2-plus-aosp

* commit 'c3e20af0b6aed8afe28be5fa08b8d69c6b50f34c':
  Refactoring the logging interface to remove dependence on NPP.
2009-12-01 05:23:29 -08:00
Derek Sollenberger
b16749e2c6 Refactoring the logging interface to remove dependence on NPP. 2009-11-30 11:55:16 -05:00
Joe Onorato
703d18b658 am 85d33844: am 199d7bed: am bcab01f6: Merge change Ic9f6bf94 into eclair
Merge commit '85d33844a48e62ecae4ca1ad56a8bdbe08fc5693'

* commit '85d33844a48e62ecae4ca1ad56a8bdbe08fc5693':
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 14:12:44 -08:00
Joe Onorato
85d33844a4 am 199d7bed: am bcab01f6: Merge change Ic9f6bf94 into eclair
Merge commit '199d7bed1184985cdd1130b4ad1e79163a5c28cc' into eclair-mr2-plus-aosp

* commit '199d7bed1184985cdd1130b4ad1e79163a5c28cc':
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 14:04:57 -08:00
Joe Onorato
199d7bed11 am bcab01f6: Merge change Ic9f6bf94 into eclair
Merge commit 'bcab01f6d0158c4d928f42b034949dc9608665a6' into eclair-mr2

* commit 'bcab01f6d0158c4d928f42b034949dc9608665a6':
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 13:58:28 -08:00
Android (Google) Code Review
bcab01f6d0 Merge change Ic9f6bf94 into eclair
* changes:
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 13:52:08 -08:00
Joe Onorato
56f880a010 Add a test app that will drain the battery. NOT IN BUILD. 2009-11-25 16:48:58 -05:00
Brett Chabot
2c860a0dfb am 92eaf4f0: am 8f4fbc5c: am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit '92eaf4f0e2dc9ed8815e1ae040cb8fb91838bc47'

* commit '92eaf4f0e2dc9ed8815e1ae040cb8fb91838bc47':
  Add keyguard permission to instrumented ImfTest package.
2009-11-25 13:16:19 -08: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
Brett Chabot
92eaf4f0e2 am 8f4fbc5c: am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit '8f4fbc5c9f52157439af6a73ee556cc80d041f5f' into eclair-mr2-plus-aosp

* commit '8f4fbc5c9f52157439af6a73ee556cc80d041f5f':
  Add keyguard permission to instrumented ImfTest package.
2009-11-25 13:09:28 -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