979 Commits

Author SHA1 Message Date
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
ad5512b7e7 am 0d8055e5: Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit '0d8055e51ce2666875e14c53e14765f673172b1c' into eclair-plus-aosp

* commit '0d8055e51ce2666875e14c53e14765f673172b1c':
  Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
2009-12-08 14:08:53 -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
8671929c5d am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-plus-aosp

* commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
  Revive backup tests
2009-12-02 18:27:28 -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
0f53c79d27 am bcab01f6: Merge change Ic9f6bf94 into eclair
Merge commit 'bcab01f6d0158c4d928f42b034949dc9608665a6' into eclair-plus-aosp

* commit 'bcab01f6d0158c4d928f42b034949dc9608665a6':
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 13:58:28 -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
Brett Chabot
8f4fbc5c9f am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-mr2

* commit 'd782b4b6f3411ece7299f414783baa3758756bbe':
  Add keyguard permission to instrumented ImfTest package.
2009-11-25 13:02:55 -08:00
Brett Chabot
c2e074c112 am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-plus-aosp

* commit 'd782b4b6f3411ece7299f414783baa3758756bbe':
  Add keyguard permission to instrumented ImfTest package.
2009-11-25 13:02:50 -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
Mike Lockwood
726a570258 resolved conflicts for merge of dfaf2e03 to master
Change-Id: I440d2042dd404a421789063e42102699fa33b7c0
2009-11-25 15:05:51 -05:00
Mike Lockwood
dfaf2e03ad am 30348b0d: Merge change I086d681f into eclair-mr2
Merge commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b' into eclair-mr2-plus-aosp

* commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b':
  Remove HardwareService and move vibrator support to VibratorService.
2009-11-25 11:54:18 -08:00
Brett Chabot
d782b4b6f3 Add keyguard permission to instrumented ImfTest package.
Workaround to fix bug 2284623

Change-Id: I80afc37ed5ffae0447e0aedba686c13d682c8076
2009-11-25 11:45:51 -08:00
Mike Lockwood
3a32213c40 Remove HardwareService and move vibrator support to VibratorService.
The lights support is only needed by PowerManagerService and NotificationManagerService, so we do not need a Binder API for it.
Move backlight and notification light support to new LightsService class.
The camera flash is now handled directly by the camera HAL, so the flash Hardware service flash support is obsolete.

Change-Id: I086d681f54668e7f7de3e8b90df3de19d59833c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-25 12:54:58 -05:00
Ben Murdoch
d0be07cb28 am 7f7c16de: Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-plus-aosp

* commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
  Improves documentation for GeolocationPermissions class. Do not merge.
2009-11-25 02:43:47 -08:00
Android (Google) Code Review
7f7c16dee2 Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
* changes:
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
  Improves documentation for GeolocationPermissions class. Do not merge.
2009-11-25 02:37:27 -08:00
Swarna Kumar
92112f0206 am e982185f: am 20342ca8: am 7f8e3409: Merge change I816428ae into eclair
Merge commit 'e982185f3403c7ca693944ebc5529d53581acf75'

* commit 'e982185f3403c7ca693944ebc5529d53581acf75':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
2009-11-24 13:42:39 -08:00
Swarna Kumar
e982185f34 am 20342ca8: am 7f8e3409: Merge change I816428ae into eclair
Merge commit '20342ca83012b442913b409a9218635de9bd6aa6' into eclair-mr2-plus-aosp

* commit '20342ca83012b442913b409a9218635de9bd6aa6':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
2009-11-24 13:37:20 -08:00
Swarna Kumar
20342ca830 am 7f8e3409: Merge change I816428ae into eclair
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2

* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
2009-11-24 13:33:13 -08:00
Swarna Kumar
0ef3b4cd93 am 7f8e3409: Merge change I816428ae into eclair
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-plus-aosp

* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
2009-11-24 13:32:43 -08:00
Swarna Kumar
9abc55ec4a Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Bug number : 2177113
2009-11-24 12:51:01 -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