Commit graph

951 commits

Author SHA1 Message Date
Dan Egnor
a6b495ce40 Clean frameworks after replacing IDropBox.aidl with
IDropBoxService.aidl, which causes some build confusion
with dependencies and Parcelables and so on.

(Will be checked in immediately after the change in question)
2009-10-28 16:25:47 -07:00
android-build SharedAccount
8a5d527223 resolved conflicts for merge of 3fa11599 to eclair-mr2 2009-10-28 16:12:11 -07:00
Scott Main
eae4fc960c am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit '836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-mr2

* commit '836a695f01799566969c12d5c83459bdb5d8b2c2':
  fix search for offline docs. again.
2009-10-28 10:30:34 -07:00
Dirk Dougherty
12313686fb am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-mr2

* commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-28 10:26:52 -07:00
Dianne Hackborn
3fa115999c Bump version to 2.1 API 6.
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
2009-10-26 17:40:19 -07:00
Scott Main
836a695f01 am f1bac52f: fix search for offline docs. again.
Merge commit 'f1bac52fe28ba503c63c929d9d0711671273635f' into eclair

* commit 'f1bac52fe28ba503c63c929d9d0711671273635f':
  fix search for offline docs. again.
2009-10-26 15:41:42 -07:00
Scott Main
f1bac52fe2 fix search for offline docs. again. 2009-10-26 14:44:48 -07:00
Dirk Dougherty
ee3a3c1f59 am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259' into eclair

* commit 'c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-26 11:18:47 -07:00
Dirk Dougherty
c2c5e505ac doc change: include SDK Tools in notice to 1.6 developers.
Bug:2160782
Change-Id: Ib70255c889495df7dbb958fe51977735554a0912
2009-10-24 14:38:58 -07:00
Scott Main
214ea8f14e am 3af366dd: am 462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '3af366ddb2634f97f440b1437bbd21d00101c93b' into eclair-mr2

* commit '3af366ddb2634f97f440b1437bbd21d00101c93b':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:13:32 -07:00
Scott Main
3af366ddb2 am 462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '462cc37742b4e7d8e348ac9264eb3e5e35cbfeef' into eclair

* commit '462cc37742b4e7d8e348ac9264eb3e5e35cbfeef':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:04:02 -07:00
Scott Main
11cb880f1e am e0ac5c3e: am 0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9' into eclair-mr2

* commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:08:14 -07:00
Scott Main
e0ac5c3e86 am 0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '0d8872e6f2462a947c1543b88a7a353072b808e3' into eclair

* commit '0d8872e6f2462a947c1543b88a7a353072b808e3':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:00:25 -07:00
Scott Main
462cc37742 docs: implement sdk announcement in a collapsible box
and revise the 'special' box color and add rounded corners.
2009-10-23 16:47:09 -07:00
Scott Main
7a0ec6b566 am f963ee63: am 60dba894: docs: add eclair logo for homepage
Merge commit 'f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-mr2

* commit 'f963ee638c974942ad99ff4ca9ec985d489e5388':
  docs: add eclair logo for homepage
2009-10-23 13:10:12 -07:00
Scott Main
0d8872e6f2 docs: change javascript so that SDK docs that are not
listed in the left nav do not highlight parent index documents
2009-10-23 13:05:56 -07:00
Scott Main
f963ee638c am 60dba894: docs: add eclair logo for homepage
Merge commit '60dba89451e4ee489720436a9a3f3de4823da7d2' into eclair

* commit '60dba89451e4ee489720436a9a3f3de4823da7d2':
  docs: add eclair logo for homepage
2009-10-23 13:02:29 -07:00
Scott Main
60dba89451 docs: add eclair logo for homepage 2009-10-23 12:22:42 -07:00
Doug Zongker
5f5f08dd22 stop adding ota-rel-keys tag when signing
ota-rel-keys is now redundant with release-keys, since there are no
"half-signed" builds any more.
2009-10-22 16:09:34 -07:00
Brett Chabot
7627a373f3 am 5449e457: Merge change I3fb149d2 into eclair
Merge commit '5449e457534a619f7b2aaa008024095023b801ba' into eclair-mr2

* commit '5449e457534a619f7b2aaa008024095023b801ba':
  Remove 'cd top' step from envsetup runtest shortcut.
2009-10-22 14:12:09 -07:00
Android (Google) Code Review
5449e45753 Merge change I3fb149d2 into eclair
* changes:
  Remove 'cd top' step from envsetup runtest shortcut.
2009-10-22 17:04:56 -04:00
Dirk Dougherty
31150b290e am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit 'f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-mr2

* commit 'f03f574a021e412b2060116c1112b62b4c21c2fe':
  doc change: template changes for new SDK doc structure.
2009-10-22 11:31:55 -07:00
Dirk Dougherty
3b5065ff86 am 51da2c57: am fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '51da2c573d945d17890e519e7e26a89b2d2f7b51' into eclair-mr2

* commit '51da2c573d945d17890e519e7e26a89b2d2f7b51':
  doc change: template/asset changes for sdk package.
2009-10-22 11:31:51 -07:00
Dirk Dougherty
f03f574a02 am 3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '3d3d7b7efd755d13c7e70f01b1ba00ba0742a354' into eclair

* commit '3d3d7b7efd755d13c7e70f01b1ba00ba0742a354':
  doc change: template changes for new SDK doc structure.
2009-10-22 11:22:00 -07:00
Dirk Dougherty
51da2c573d am fce6b45f: doc change: template/asset changes for sdk package.
Merge commit 'fce6b45f629e59b79beed1c18486530c00769bbf' into eclair

* commit 'fce6b45f629e59b79beed1c18486530c00769bbf':
  doc change: template/asset changes for sdk package.
2009-10-22 11:21:51 -07:00
Owen Lin
355670b985 am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2

* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
  Add OVERRIDE_PACKAGES support for prebuild modules.
2009-10-22 06:44:28 -07:00
Brandon Ballinger
c6c462434c am 36f349ac: Merge change Ied29246e into eclair
Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2

* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
2009-10-22 06:43:04 -07:00
Doug Zongker
b04f8cdccf am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-mr2

* commit 'decdbd7956c34895f73001cfa2018a27c8702ad0':
  use aapt to build jar files instead of the system zip (DO NOT MERGE)
2009-10-21 22:22:32 -07:00
Brett Chabot
3fb149d2cb Remove 'cd top' step from envsetup runtest shortcut.
Instead, execute runtest as an absolute path. Ths is necessary to support
relative path based arguments in runtest. Bug 2133198
2009-10-21 20:05:26 -07:00
Dirk Dougherty
3d3d7b7efd doc change: template changes for new SDK doc structure.
Bug:2160782
2009-10-21 19:52:52 -07:00
Owen Lin
64d5a80706 Add OVERRIDE_PACKAGES support for prebuild modules.
So that some prebuild module can override existing packages.

Change-Id: I4f0d019e07b84d24cf0234903bd4b06104e0ed27
2009-10-20 22:23:37 -07:00
Android (Google) Code Review
36f349acc9 Merge change Ied29246e into eclair
* changes:
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
2009-10-20 22:28:45 -04:00
Brandon Ballinger
ed29246e31 Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules. 2009-10-20 17:41:16 -07:00
Android (Google) Code Review
decdbd7956 Merge change I5e98e6f0 into eclair
* changes:
  use aapt to build jar files instead of the system zip (DO NOT MERGE)
2009-10-20 16:28:14 -04:00
Owen Lin
daf234d374 am 0a7b54de: Add package Gallery into default build.
Merge commit '0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21' into eclair-mr2

* commit '0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21':
  Add package Gallery into default build.
2009-10-20 09:57:53 -07:00
Owen Lin
0a7b54de3a Add package Gallery into default build.
Change-Id: Ia4447fdb6c4c26a5419ef59cc9d8276838a95854
2009-10-20 03:13:04 -07:00
Doug Zongker
5e98e6f05c use aapt to build jar files instead of the system zip (DO NOT MERGE)
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.

(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
2009-10-19 17:05:46 -07:00
Steve Block
9234663c55 WebKit clean required by merge with new WebKit version.
Change-Id: I59377d6a0420bfb13b25b4ed7240b47e8aae6114
2009-10-19 18:41:07 +01:00
Dirk Dougherty
fce6b45f62 doc change: template/asset changes for sdk package. 2009-10-16 17:14:33 -07:00
Android (Google) Code Review
6ebf443631 Merge change I04432db5 into eclair-mr2
* changes:
  use aapt to build jar files instead of the system zip
2009-10-13 17:12:59 -04:00
Raphael
feec1ce3e0 am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
2009-10-13 12:17:40 -07:00
Raphael
aa569862de Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
2009-10-12 16:16:02 -07:00
Doug Zongker
9e4374be2c use aapt to build jar files instead of the system zip
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
2009-10-09 12:14:03 -07:00
Dianne Hackborn
3f7405e994 am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
2009-10-08 21:07:12 -07:00
Dianne Hackborn
ff6f3fe448 Finish issue #2168428: STOP SHIP: Bump API version to 5.
We are now 2.0.  Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.

Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
2009-10-08 20:50:27 -07:00
Brett Chabot
01c8ef9f51 Merge commit '1b3886b8' into manualmerge 2009-10-08 17:24:02 -07:00
Brett Chabot
e4e3a85fae Merge commit 'af6ccb69' into manualmerge 2009-10-08 13:47:07 -07:00
Brett Chabot
1b3886b848 am 45dc54f6: Add speech tests to CTS makefile.
Merge commit '45dc54f680faea12519870db356f84924c00687d' into eclair

* commit '45dc54f680faea12519870db356f84924c00687d':
  Add speech tests to CTS makefile.
2009-10-08 10:48:24 -07:00
Brett Chabot
af6ccb69fe am 30e1f2bd: Add dpi tests to CTS.
Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair

* commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
  Add dpi tests to CTS.
2009-10-08 10:48:20 -07:00
Brett Chabot
45dc54f680 Add speech tests to CTS makefile. 2009-10-08 10:00:37 -07:00