Commit graph

545 commits

Author SHA1 Message Date
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
Dirk Dougherty
f3cc23fc8e am 99dd0f86: am 31150b29: am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '99dd0f8604319dd1316045e74de4296fff42810a'

* commit '99dd0f8604319dd1316045e74de4296fff42810a':
  doc change: template changes for new SDK doc structure.
2009-10-22 11:51:14 -07:00
Dirk Dougherty
12b198e0a7 am 308228ba: am 3b5065ff: am 51da2c57: am fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '308228baa983d5216a7f3bfaff1547f88a99465b'

* commit '308228baa983d5216a7f3bfaff1547f88a99465b':
  doc change: template/asset changes for sdk package.
2009-10-22 11:51:10 -07:00
Dirk Dougherty
99dd0f8604 am 31150b29: am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '31150b290e980254b0a92f753add0749b9c4b1ca' into eclair-mr2-plus-aosp

* commit '31150b290e980254b0a92f753add0749b9c4b1ca':
  doc change: template changes for new SDK doc structure.
2009-10-22 11:41:38 -07:00
Dirk Dougherty
308228baa9 am 3b5065ff: am 51da2c57: am fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '3b5065ff869b85750eb191112235d46a48c05a49' into eclair-mr2-plus-aosp

* commit '3b5065ff869b85750eb191112235d46a48c05a49':
  doc change: template/asset changes for sdk package.
2009-10-22 11:41:34 -07:00
Dirk Dougherty
3d3d7b7efd doc change: template changes for new SDK doc structure.
Bug:2160782
2009-10-21 19:52:52 -07:00
Dirk Dougherty
fce6b45f62 doc change: template/asset changes for sdk package. 2009-10-16 17:14:33 -07:00
Android (Google) Code Review
dc54d239a2 Merge change I29b5b2d9
* changes:
  Add new tabs for Compatibility and Get Source to source.android.com framework
2009-10-13 11:51:30 -04:00
Doug Zongker
441dd2b016 am 160028f8: am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
Merge commit '160028f8325e9e1face3fc6f17baef498ee3e53d'

* commit '160028f8325e9e1face3fc6f17baef498ee3e53d':
  move recovery image to the top of the OTA package
2009-10-12 12:40:19 -07:00
Marco Nelissen
a470587e5c am fb74a21f: am f885d876: Merge change I2bdc7ec9 into eclair
Merge commit 'fb74a21f4792e08c1ebee5d0347698885e31d805'

* commit 'fb74a21f4792e08c1ebee5d0347698885e31d805':
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-12 11:41:42 -07:00
Scott Main
67484da8a7 am b268d30a: am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289'

* commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289':
  docs only.
2009-10-12 11:41:10 -07:00
Gaurav Mathur
29b5b2d94f Add new tabs for Compatibility and Get Source to source.android.com framework 2009-10-08 23:54:35 -07:00
Doug Zongker
7484d0e04a am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-plus-aosp

* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
  move recovery image to the top of the OTA package
2009-10-07 17:17:45 -07:00
Doug Zongker
f2b32f2a4b resolved conflicts for merge of cfd7db6d to eclair 2009-10-07 17:05:36 -07:00
Doug Zongker
cfd7db6d84 move recovery image to the top of the OTA package
Make the recovery image be the first thing installed in system/ in the
OTA package, so it will get installed even if the system partition
fills during OTA installation.
2009-10-07 16:26:00 -07:00
Marco Nelissen
7c6d0c2e9e am f885d876: Merge change I2bdc7ec9 into eclair
Merge commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-plus-aosp

* commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-07 11:54:04 -07:00
Scott Main
6eeedf0124 am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-plus-aosp

* commit '5f0241f5d8da1db2721c19d7629115a6c1c71639':
  docs only.
2009-10-07 11:53:41 -07:00
Android (Google) Code Review
69625548bf Merge change I239e9f26 into donut
* changes:
  Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit e44fadeb49)
2009-10-06 14:36:51 -04:00
Android (Google) Code Review
f885d876a2 Merge change I2bdc7ec9 into eclair
* changes:
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-06 13:48:38 -04:00
Scott Main
5f0241f5d8 am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair

* commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
  docs only.
2009-10-06 10:14:01 -07:00
Scott Main
37bfad5ce8 docs only.
fix FF2 browser bug in header layout

http://b/2031559

Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
2009-10-06 09:27:10 -07:00
Scott Main
07dc76fee2 am 95035daf: am 39715e2f: Merge change I962d468d into eclair
Merge commit '95035daffba91e776734c927c01d104c4478bd9e'

* commit '95035daffba91e776734c927c01d104c4478bd9e':
  revise the deprecated warning to use the 'caution'
2009-10-01 12:22:34 -07:00
Dirk Dougherty
dfea61dedb am 8fd5fb34: am 96dcc3a9: am 7259bae0: Merge change Ied94685e into donut
Merge commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9'

* commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9':
  Add NDK version reference to template.
2009-10-01 12:13:30 -07:00
Doug Zongker
5eec9dd20f am da2d06bb: am c18736b1: remember device-specific releasetools extensions in target-files
Merge commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412'

* commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412':
  remember device-specific releasetools extensions in target-files
2009-10-01 12:10:52 -07:00
Andy McFadden
d5c079ee27 am 27c6f996: am c3c136c4: Merge change I95ed76bd into eclair
Merge commit '27c6f996e9636d6af27a72c4817d082151bc1dea'

* commit '27c6f996e9636d6af27a72c4817d082151bc1dea':
  Update usage and readme for zipalign.
2009-10-01 11:17:31 -07:00
Scott Main
95035daffb am 39715e2f: Merge change I962d468d into eclair
Merge commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9' into eclair-plus-aosp

* commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9':
  revise the deprecated warning to use the 'caution'
2009-09-30 15:33:55 -07:00
Android (Google) Code Review
39715e2f3d Merge change I962d468d into eclair
* changes:
  revise the deprecated warning to use the 'caution' style and add a line break
2009-09-30 18:23:08 -04:00
Scott Main
962d468d73 revise the deprecated warning to use the 'caution'
style and add a line break
2009-09-30 14:37:32 -07:00
Mike Ritter
239e9f2671 Bug in Mac build where it gets confused over case, fix no longer needed.
(cherry picked from commit e44fadeb49)
2009-09-30 12:09:19 -07:00
Dirk Dougherty
8fd5fb34ab am 96dcc3a9: am 7259bae0: Merge change Ied94685e into donut
Merge commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4' into eclair-plus-aosp

* commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4':
  Add NDK version reference to template.
2009-09-30 11:43:32 -07:00
Dirk Dougherty
96dcc3a98e am 7259bae0: Merge change Ied94685e into donut
Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair

* commit '7259bae08d7915c0d5ba6427c815d7576c0ef045':
  Add NDK version reference to template.
2009-09-30 11:32:09 -07:00
Doug Zongker
da2d06bb1c am c18736b1: remember device-specific releasetools extensions in target-files
Merge commit 'c18736b1a777c386dc3c5e3f878249770b5edd78' into eclair-plus-aosp

* commit 'c18736b1a777c386dc3c5e3f878249770b5edd78':
  remember device-specific releasetools extensions in target-files
2009-09-30 10:18:57 -07:00
Doug Zongker
c18736b1a7 remember device-specific releasetools extensions in target-files
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
2009-09-30 09:20:32 -07:00
Andy McFadden
27c6f996e9 am c3c136c4: Merge change I95ed76bd into eclair
Merge commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f' into eclair-plus-aosp

* commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f':
  Update usage and readme for zipalign.
2009-09-29 11:41:46 -07:00
Android (Google) Code Review
c3c136c4cd Merge change I95ed76bd into eclair
* changes:
  Update usage and readme for zipalign.
2009-09-29 14:31:43 -04:00
Andy McFadden
95ed76bd3e Update usage and readme for zipalign.
Added the "-c" flag to the README, and added a short description of the
flag meanings to the usage output.  Threw in an AOSP copyright one-liner
for good measure.
2009-09-29 10:55:32 -07:00
Marco Nelissen
2bdc7ec9cf Speed up warn.py about 30x by precompiling all the regular expressions. 2009-09-29 10:19:29 -07:00
Android (Google) Code Review
7259bae08d Merge change Ied94685e into donut
* changes:
  Add NDK version reference to template.
2009-09-29 11:43:24 -04:00
Doug Zongker
7a6f198727 am 2499b8d7: am 481c4e65: fix python syntax error
Merge commit '2499b8d78087edcac97dff4b2d5dd3f14ee8eb3c'

* commit '2499b8d78087edcac97dff4b2d5dd3f14ee8eb3c':
  fix python syntax error
2009-09-28 10:31:10 -07:00
Doug Zongker
2499b8d780 am 481c4e65: fix python syntax error
Merge commit '481c4e650fe6cdb9c63ad04b35d221a2856ca48d' into eclair-plus-aosp

* commit '481c4e650fe6cdb9c63ad04b35d221a2856ca48d':
  fix python syntax error
2009-09-28 10:20:34 -07:00
Doug Zongker
481c4e650f fix python syntax error 2009-09-28 10:07:13 -07:00
Jeff Hamilton
8206868b32 am f568c602: am d85472a7: Fix the build. imgdiff.c needed #include <sys/types.h>.
Merge commit 'f568c602b5726d4212d3e8712b6b13ff3e5230e5'

* commit 'f568c602b5726d4212d3e8712b6b13ff3e5230e5':
  Fix the build. imgdiff.c needed #include <sys/types.h>.
2009-09-28 01:06:35 -07:00
Doug Zongker
1a008b6c31 am 92247b38: am 7f116185: add missing include directory
Merge commit '92247b3893abca1de15a564592b891be493f9d35'

* commit '92247b3893abca1de15a564592b891be493f9d35':
  add missing include directory
2009-09-27 15:42:51 -07:00
Doug Zongker
8c5b435698 am a785cb55: am 2bd8abc7: Merge change 27088 into eclair
Merge commit 'a785cb55aa40c4bd251a528edb169d6e1a865169'

* commit 'a785cb55aa40c4bd251a528edb169d6e1a865169':
  integrate bsdiff into imgdiff, instead of using subprocess
2009-09-27 15:42:34 -07:00
Scott Main
249be1036a am dfa9bc7a: am 6159eead: am afdb6feb: Merge change 27127 into donut
Merge commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c'

* commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c':
  docs only.
2009-09-27 15:40:02 -07:00
Doug Zongker
b138371377 am f78bee74: am ea4a3fa3: Merge change 27066 into eclair
Merge commit 'f78bee7494653f900ecfa7a9c618b1c85ffacda6'

* commit 'f78bee7494653f900ecfa7a9c618b1c85ffacda6':
  parallellize computation of binary patches
2009-09-27 15:36:37 -07:00
Jeff Hamilton
f568c602b5 am d85472a7: Fix the build. imgdiff.c needed #include <sys/types.h>.
Merge commit 'd85472a7461d0daeb7e17a6f0a7c56f37a2335bc' into eclair-plus-aosp

* commit 'd85472a7461d0daeb7e17a6f0a7c56f37a2335bc':
  Fix the build. imgdiff.c needed #include <sys/types.h>.
2009-09-25 20:51:36 -07:00
Jeff Hamilton
d85472a746 Fix the build. imgdiff.c needed #include <sys/types.h>.
Change-Id: I82169a926e7df2aa92bac2c4f427bc64f4811362
2009-09-25 21:47:52 -05:00
Doug Zongker
92247b3893 am 7f116185: add missing include directory
Merge commit '7f116185cc254653f9f7abd572d2619d5ddc6f04' into eclair-plus-aosp

* commit '7f116185cc254653f9f7abd572d2619d5ddc6f04':
  add missing include directory
2009-09-25 17:13:36 -07:00
Doug Zongker
7f116185cc add missing include directory
Should have been in change Id98e0870 (though it builds on my machine
even without this...)
2009-09-25 17:02:20 -07:00
Doug Zongker
a785cb55aa am 2bd8abc7: Merge change 27088 into eclair
Merge commit '2bd8abc7c676b28bc34294f6b0be28d98520029f' into eclair-plus-aosp

* commit '2bd8abc7c676b28bc34294f6b0be28d98520029f':
  integrate bsdiff into imgdiff, instead of using subprocess
2009-09-25 16:52:11 -07:00
Android (Google) Code Review
2bd8abc7c6 Merge change 27088 into eclair
* changes:
  integrate bsdiff into imgdiff, instead of using subprocess
2009-09-25 19:43:55 -04:00
Scott Main
dfa9bc7ab1 am 6159eead: am afdb6feb: Merge change 27127 into donut
Merge commit '6159eead22482c46151b9da077bf2fb8bdad1dbc' into eclair-plus-aosp

* commit '6159eead22482c46151b9da077bf2fb8bdad1dbc':
  docs only.
2009-09-25 15:10:33 -07:00
Scott Main
6159eead22 am afdb6feb: Merge change 27127 into donut
Merge commit 'afdb6feb9b5051f93cecb7fca77cc4a2b3a702ba' into eclair

* commit 'afdb6feb9b5051f93cecb7fca77cc4a2b3a702ba':
  docs only.
2009-09-25 15:00:40 -07:00
Android (Google) Code Review
afdb6feb9b Merge change 27127 into donut
* changes:
  docs only. inherit the line height to resolve vertical scroll issue in WebKit browsers
2009-09-25 17:48:11 -04:00
Scott Main
18a4883ab3 docs only.
inherit the line height to resolve vertical scroll
issue in WebKit browsers

Change-Id: I1707893614e3983e6b53a31229b3e19e584d6950
2009-09-25 14:38:33 -07:00
Doug Zongker
f78bee7494 am ea4a3fa3: Merge change 27066 into eclair
Merge commit 'ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca' into eclair-plus-aosp

* commit 'ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca':
  parallellize computation of binary patches
2009-09-25 12:50:46 -07:00
Android (Google) Code Review
ea4a3fa3d4 Merge change 27066 into eclair
* changes:
  parallellize computation of binary patches
2009-09-25 15:40:43 -04:00
Doug Zongker
761e642d54 parallellize computation of binary patches
Change ota_from_target_files to compute binary patches for all the
changed files in the OTA package in parallel.  On a recent test build
this cuts incremental construction time roughly in half (6 min to 2
min 40 sec).
2009-09-25 12:35:11 -07:00
Doug Zongker
d98e087042 integrate bsdiff into imgdiff, instead of using subprocess
Integrate the bsdiff code into imgdiff so we can just call it rather
than writing temp files and invoking bsdiff as a subprocess.  When
computing multiple patches from the same source file, we can also save
time by doing some bsdiff preprocessing on the source file only once.

(Note this renames the existing 'bsdiff.c' -- which actually does
patching in applypatch -- to 'bspatch.c', and introduces a new
bsdiff.c linked into imgdiff.)
2009-09-25 11:52:00 -07:00
Scott Main
20bd674021 am 93c80c4f: am 0c44a2a9: am ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit '93c80c4f073811a8fab78e8b56fc2eef87aa0707'

* commit '93c80c4f073811a8fab78e8b56fc2eef87aa0707':
  adds a parameter to the URL hash on all search queries.
2009-09-25 11:25:14 -07:00
Scott Main
46a39b74a7 am 207ce1fc: am b91916b4: docs only. change the SDK tab to point to the release notes in offline mode; hide all other languages by default instead of depending on the stylesheet
Merge commit '207ce1fce5099ac7da18c28f63519d6103a1db32'

* commit '207ce1fce5099ac7da18c28f63519d6103a1db32':
  docs only.
2009-09-25 11:16:38 -07:00
Scott Main
1e7ee1a568 am 4dc826b7: am 389cdb7a: Merge change 26258 into eclair
Merge commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7'

* commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7':
  docs only.
2009-09-25 11:10:25 -07:00
David 'Digit' Turner
085603258c am d9a8e1b3: am ef453a51: Fix ARMv7 -user builds
Merge commit 'd9a8e1b30961392bc818467ae526f6cca35ced8d'

* commit 'd9a8e1b30961392bc818467ae526f6cca35ced8d':
  Fix ARMv7 -user builds
2009-09-25 10:59:31 -07:00
Scott Main
93c80c4f07 am 0c44a2a9: am ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit '0c44a2a9f3fb4a6be94bfaa4f00cbccca1dbb57c' into eclair-plus-aosp

* commit '0c44a2a9f3fb4a6be94bfaa4f00cbccca1dbb57c':
  adds a parameter to the URL hash on all search queries.
2009-09-25 09:23:38 -07:00
Scott Main
0c44a2a9f3 am ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit 'ad4d4efac403eeba5d648f172aca46c3ad7962c5' into eclair

* commit 'ad4d4efac403eeba5d648f172aca46c3ad7962c5':
  adds a parameter to the URL hash on all search queries.
2009-09-25 09:15:00 -07:00
Doug Zongker
d2941cffe1 am 27495d85: am 4b7dd3e3: Merge change 26017 into eclair
Merge commit '27495d857c505753ad834b3cfdc312902e1c3919'

* commit '27495d857c505753ad834b3cfdc312902e1c3919':
  improve the OTA progress bar
2009-09-25 08:45:37 -07:00
Scott Main
ad4d4efac4 adds a parameter to the URL hash on all search queries.
depends on change 3583, in order to handle the new parameter

Change-Id: I86ead029371615243cfd809bd7cb2a2f2830c4be
2009-09-24 20:41:29 -07:00
Scott Main
207ce1fce5 am b91916b4: docs only. change the SDK tab to point to the release notes in offline mode; hide all other languages by default instead of depending on the stylesheet
Merge commit 'b91916b414b3c4ef3ec68bec9e84694d03a15331' into eclair-plus-aosp

* commit 'b91916b414b3c4ef3ec68bec9e84694d03a15331':
  docs only.
2009-09-24 20:19:17 -07:00
Scott Main
b91916b414 docs only.
change the SDK tab to point to the release notes in offline mode;
hide all other languages by default instead of
depending on the stylesheet
2009-09-24 19:50:56 -07:00
Scott Main
4dc826b75c am 389cdb7a: Merge change 26258 into eclair
Merge commit '389cdb7ab60182292fe383bc1c29d7b77ca5a893' into eclair-plus-aosp

* commit '389cdb7ab60182292fe383bc1c29d7b77ca5a893':
  docs only.
2009-09-24 14:01:36 -07:00
Android (Google) Code Review
389cdb7ab6 Merge change 26258 into eclair
* changes:
  docs only. remove Home tab from offline docs and make SDK tab point to new offline welcome page; hide all other languages by default instead of depending on the stylesheet
2009-09-24 16:50:31 -04:00
David 'Digit' Turner
d9a8e1b309 am ef453a51: Fix ARMv7 -user builds
Merge commit 'ef453a51f58713bfa31c13f5e66596b3d5752049' into eclair-plus-aosp

* commit 'ef453a51f58713bfa31c13f5e66596b3d5752049':
  Fix ARMv7 -user builds
2009-09-23 21:41:07 -07:00
David 'Digit' Turner
ef453a51f5 Fix ARMv7 -user builds
Allow the dex preoptimization pass for ARMv7 system images to use the
ARMv7-specific kernel image. This is needed to fix the -user builds that
absolutely depend on running the dex preopt in the emulator.

This will hopefully be removed when we'll be able to perform the dex
preopt on the host instead.
2009-09-23 18:48:16 -07:00
Dirk Dougherty
5c450ed169 Add NDK version reference to template.
Change-Id: Ied94685e7c8dde2eab4f708d30cbf2757cea10d5
2009-09-23 17:31:16 -07:00
Doug Zongker
27495d857c am 4b7dd3e3: Merge change 26017 into eclair
Merge commit '4b7dd3e36c949729464029480ca41753c122d7f0' into eclair-plus-aosp

* commit '4b7dd3e36c949729464029480ca41753c122d7f0':
  improve the OTA progress bar
2009-09-22 18:18:12 -07:00
Scott Main
29f9e1aa63 docs only.
remove Home tab from offline docs and make
SDK tab point to new offline welcome page;
hide all other languages by default instead of
depending on the stylesheet
2009-09-21 14:50:19 -07:00
Doug Zongker
881dd40ffb improve the OTA progress bar
Make the OTA progress bar advance a bit more smoothly by reallocating
how much is dedicated to various phases of incremental OTA
installation, based on some crude measurements of how long each phase
takes.
2009-09-20 14:03:55 -07:00
Scott Main
a5a849aee7 am b66f9b3e: am 9958256b: am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit 'b66f9b3e367c4f15eeab7a54cd8d5331f3787b1e'

* commit 'b66f9b3e367c4f15eeab7a54cd8d5331f3787b1e':
  docs only.
2009-09-17 12:45:36 -07:00
Scott Main
b66f9b3e36 am 9958256b: am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit '9958256b202e5ad5554bf91d4d77655662b31d5b' into eclair-plus-aosp

* commit '9958256b202e5ad5554bf91d4d77655662b31d5b':
  docs only.
2009-09-17 12:36:03 -07:00
Scott Main
9958256b20 am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit '1da823869ccbc5f848cdd35d52d1630886288446' into eclair

* commit '1da823869ccbc5f848cdd35d52d1630886288446':
  docs only.
2009-09-17 12:29:05 -07:00
Scott Main
1da823869c docs only.
use normal DOM mod instead of jquery to load the lists.js
file because jquery was appending GET parameters that
eliminated any caching of the file.

Change-Id: I926ef8c164ba81d040256accaf78883807c3b57e
2009-09-17 10:54:05 -07:00
Dirk Dougherty
107662f637 am f2ffc366: am 60bbe187: am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit 'f2ffc36648c5660846f8e8c173644e0b6b4e0288'

* commit 'f2ffc36648c5660846f8e8c173644e0b6b4e0288':
  Change sdk doc template so that ADT download link bypasses clickthrough.
2009-09-17 09:57:12 -07:00
Mike Ritter
2f37944a4a am 31d00206: am e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit '31d002062e3735767401a26728e8bd5807095532'

* commit '31d002062e3735767401a26728e8bd5807095532':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-09-17 06:38:46 -07:00
Dirk Dougherty
f2ffc36648 am 60bbe187: am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit '60bbe187da1e0b5aa753c3611e81cbb61f886599' into eclair-plus-aosp

* commit '60bbe187da1e0b5aa753c3611e81cbb61f886599':
  Change sdk doc template so that ADT download link bypasses clickthrough.
2009-09-16 11:30:41 -07:00
Dirk Dougherty
60bbe187da am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit 'c66c90a803ef256b5f945d10bd0ddd5abae15d64' into eclair

* commit 'c66c90a803ef256b5f945d10bd0ddd5abae15d64':
  Change sdk doc template so that ADT download link bypasses clickthrough.
2009-09-16 11:23:08 -07:00
Dirk Dougherty
c66c90a803 Change sdk doc template so that ADT download link bypasses clickthrough.
Change-Id: Ibea052b718f17043c992af7d5334b1c7e4fe2c6b
2009-09-16 10:11:01 -07:00
Mike Ritter
31d002062e am e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f' into eclair-plus-aosp

* commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-09-15 13:45:42 -07:00
Xavier Ducrohet
c10001ea56 am 2f7cfd2a: am be49598e: Merge change 24712 into eclair
Merge commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97'

* commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97':
  Fix CS templates to handle non-included classes.
2009-09-15 13:16:12 -07:00
Scott Main
352e8d79b9 am 40a65ab4: am 5175caf6: am ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit '40a65ab4e6b71ad266bb29eb129283d6d709b7e9'

* commit '40a65ab4e6b71ad266bb29eb129283d6d709b7e9':
  docs only.
2009-09-15 13:14:16 -07:00
Mike Ritter
e44fadeb49 Bug in Mac build where it gets confused over case, fix no longer needed. 2009-09-15 11:18:31 -07:00
Xavier Ducrohet
2f7cfd2a52 am be49598e: Merge change 24712 into eclair
Merge commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9' into eclair-plus-aosp

* commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9':
  Fix CS templates to handle non-included classes.
2009-09-11 12:06:49 -07:00
Android (Google) Code Review
be49598e2d Merge change 24712 into eclair
* changes:
  Fix CS templates to handle non-included classes.
2009-09-11 14:58:54 -04:00
Xavier Ducrohet
63ec8e3b58 Fix CS templates to handle non-included classes.
This fix is to handle generate documentation not including base clases
(like java.* or android.*). Links to missing base classes must not be
created or they would point nowhere.

Change-Id: Ic591916fe9b6802903d894bd2cd3c45690533912
2009-09-11 11:14:00 -07:00
Scott Main
40a65ab4e6 am 5175caf6: am ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit '5175caf6eaab1b22c4cc1f352f22cd69d291a68e' into eclair-plus-aosp

* commit '5175caf6eaab1b22c4cc1f352f22cd69d291a68e':
  docs only.
2009-09-11 10:58:58 -07:00
Scott Main
5175caf6ea am ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit 'ded57160b406d5b253206cf5884ab9b33ac23b3c' into eclair

* commit 'ded57160b406d5b253206cf5884ab9b33ac23b3c':
  docs only.
2009-09-11 10:49:26 -07:00
Scott Main
ded57160b4 docs only.
new donut image for compatibility with IE6 transparency issues

Change-Id: I444b09d7c5b211b3a07e7221ad96b3a7e4d989f7
2009-09-11 10:31:36 -07:00
Xavier Ducrohet
a4faa18b6f am 030df428: am 85762123: Merge change 24584 into eclair
Merge commit '030df428443735eed084286564407198792daa82'

* commit '030df428443735eed084286564407198792daa82':
  Add support for @pending annotation.
2009-09-10 15:19:55 -07:00
Xavier Ducrohet
c35eaf7e98 am aca5e20e: am a3c35d19: Merge change 24565 into eclair
Merge commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea'

* commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea':
  Add missing @Override to DroidDoc and ApiCheck
2009-09-10 15:19:51 -07:00
Xavier Ducrohet
030df42844 am 85762123: Merge change 24584 into eclair
Merge commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp

* commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83':
  Add support for @pending annotation.
2009-09-10 15:10:39 -07:00
Xavier Ducrohet
aca5e20e4a am a3c35d19: Merge change 24565 into eclair
Merge commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2' into eclair-plus-aosp

* commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2':
  Add missing @Override to DroidDoc and ApiCheck
2009-09-10 15:10:36 -07:00
Xavier Ducrohet
02e14df59f Add support for @pending annotation.
This behaves the same as @hide, but can be used to annotate API that are
only hidden pending API approval.

Change-Id: I4c0bf46c6d74ed45a8890ecdfd9b14ce234a5c18
2009-09-10 14:50:12 -07:00
Xavier Ducrohet
5ee390d856 Add missing @Override to DroidDoc and ApiCheck
Change-Id: Ic7829a4ea62a614ef8b525bd84f8fbaaa4674d06
2009-09-10 14:46:21 -07:00
Alexey Tarasov
1fcce11eed Cosmetic fixes in css/js 2009-09-08 15:29:54 -07:00
Jean-Baptiste Queru
dc785843c7 merge from donut 2009-09-03 14:12:45 -07:00
Dirk Dougherty
49a92efc18 am 5043a836: am af2a2a61: am 4d545a82: Merge change 23037 into donut
Merge commit '5043a836a77a623578590a6a76f34e2b121fe1e1'

* commit '5043a836a77a623578590a6a76f34e2b121fe1e1':
  Doc changes for SDK update.
2009-09-02 19:04:00 -07:00
Dirk Dougherty
5043a836a7 am af2a2a61: am 4d545a82: Merge change 23037 into donut
Merge commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca' into eclair-plus-aosp

* commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca':
  Doc changes for SDK update.
2009-09-02 19:01:33 -07:00
Dirk Dougherty
af2a2a61ed am 4d545a82: Merge change 23037 into donut
Merge commit '4d545a82917db0ca90494e4cfb7944e1b5ea564a' into eclair

* commit '4d545a82917db0ca90494e4cfb7944e1b5ea564a':
  Doc changes for SDK update.
2009-09-02 18:58:52 -07:00
Android (Google) Code Review
4d545a8291 Merge change 23037 into donut
* changes:
  Doc changes for SDK update. Update SDK toc template.
2009-09-02 18:57:09 -07:00
Doug Zongker
dc8d202008 am 0646e78e: am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files
Merge commit '0646e78e9969762ead938f953c7283d984333d99'

* commit '0646e78e9969762ead938f953c7283d984333d99':
  do a pass of normal-chunk-merging before comparing src and tgt files
2009-09-02 13:34:19 -07:00
Doug Zongker
99677d23a2 am 279bae71: am 15604b84: use imgdiff -z to diff zipfiles
Merge commit '279bae719765f4fb9fc372323d680690b5842f90'

* commit '279bae719765f4fb9fc372323d680690b5842f90':
  use imgdiff -z to diff zipfiles
2009-09-02 13:33:28 -07:00
Doug Zongker
0646e78e99 am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files
Merge commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54' into eclair-plus-aosp

* commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54':
  do a pass of normal-chunk-merging before comparing src and tgt files
2009-09-02 11:15:52 -07:00
Doug Zongker
d7d7ab00f5 do a pass of normal-chunk-merging before comparing src and tgt files
Merge the gzip footer and header together with any adjacent normal
chunks before comparing chunk structures; this should make the
recovery-from-boot diff not fail due to differences in the footer
after the ramdisk part of the image.
2009-09-02 11:10:51 -07:00
Doug Zongker
279bae7197 am 15604b84: use imgdiff -z to diff zipfiles
Merge commit '15604b84e246514da6c9721266919003f734380b' into eclair-plus-aosp

* commit '15604b84e246514da6c9721266919003f734380b':
  use imgdiff -z to diff zipfiles
2009-09-02 08:56:05 -07:00
Doug Zongker
15604b84e2 use imgdiff -z to diff zipfiles
imgdiff now understands the zip file format and can produce smaller
patches by doing the patching in uncompressed space.  Start taking
advantage of this for .zip, .apk, and .jar files.
2009-09-01 17:53:34 -07:00
Scott Main
c2b5b036d4 am d90f315f: am cca05d9e: am a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs
Merge commit 'd90f315fc0cba9c473e53c57a74a9071e10dedac'

* commit 'd90f315fc0cba9c473e53c57a74a9071e10dedac':
  docs only.
2009-09-01 12:15:33 -07:00
Jean-Baptiste Queru
4730a61599 am 37321fde: merge from open-source master
Merge commit '37321fdeeffc707cb33bd433dca27f18c205d1fe'

* commit '37321fdeeffc707cb33bd433dca27f18c205d1fe':
  kcm tool fix for the keyboard output permissions
2009-09-01 12:14:15 -07:00
Scott Main
d90f315fc0 am cca05d9e: am a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs
Merge commit 'cca05d9e658b4357995a73ca72793d46100aae8e' into eclair-plus-aosp

* commit 'cca05d9e658b4357995a73ca72793d46100aae8e':
  docs only.
2009-09-01 10:43:15 -07:00
Scott Main
cca05d9e65 am a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs
Merge commit 'a01ee1ea93cd2a4d876fcb5678392bbd277b6042' into eclair

* commit 'a01ee1ea93cd2a4d876fcb5678392bbd277b6042':
  docs only.
2009-09-01 10:41:03 -07:00
Scott Main
a01ee1ea93 docs only.
my previous change to the list styles was the wrong solution.
this fixes all prior problems with nested lists in OLs, ULs, and DLs
2009-09-01 10:36:55 -07:00
Jean-Baptiste Queru
37321fdeef merge from open-source master 2009-09-01 08:27:43 -07:00
Andy McFadden
9611ceb460 Flush every line of output.
Works better when the output is piped through "tee" to a file.
2009-08-31 13:38:35 -07:00
Dirk Dougherty
123bb1228b Doc changes for SDK update.
Update SDK toc template.
2009-08-27 16:48:25 -07:00
Doug Zongker
75b4ba0e4d am f76b9c87: remove bootloader assertions
Merge commit 'f76b9c87b16956aebfe5af497913d698dd03cc01'

* commit 'f76b9c87b16956aebfe5af497913d698dd03cc01':
  remove bootloader assertions
2009-08-27 16:25:24 -07:00
Jay Schroeder
b7e96e4498 kcm tool fix for the keyboard output permissions
This patch adds read permission for everyone to the output files of the
kcm tool. The compiled keycharmap files need to be able to be read by
everyone. This fixes a problem at startup being unable to read the
*.kcm.bin files located at <android-root>/system/usr/keychars.
2009-08-27 18:16:25 -05:00
Doug Zongker
f76b9c87b1 remove bootloader assertions
These should be done by the device-specific module where necessary;
they aren't appropriate for all devices.
2009-08-27 16:12:00 -07:00
Joshua Bloch
855003deb7 Making Droiddoc not explode when inherited interfaces disappear. 2009-08-27 14:43:03 -07:00
Scott Main
9aa4927072 am e06d28ec: am dab571d6: Merge change 22524 into donut
Merge commit 'e06d28ecd7df35d9ab978edbf93129a0f1ad610a'

* commit 'e06d28ecd7df35d9ab978edbf93129a0f1ad610a':
  docs only.
2009-08-26 09:34:11 -07:00
Scott Main
e06d28ecd7 am dab571d6: Merge change 22524 into donut
Merge commit 'dab571d613c2d9955163fa672e3b8ad92fdf5cb7' into eclair

* commit 'dab571d613c2d9955163fa672e3b8ad92fdf5cb7':
  docs only.
2009-08-26 09:29:28 -07:00
Scott Main
694972774e docs only.
fix api level highlighting for the treeview navigation.
2009-08-24 17:33:06 -07:00
Doug Zongker
ce8f172e1f am 2f78b8ba: am 8fead691: Merge change 22448 into donut
Merge commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac'

* commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac':
  incremental OTAs should remove /system/recovery.img
2009-08-24 13:43:52 -07:00
Doug Zongker
2f78b8ba12 am 8fead691: Merge change 22448 into donut
Merge commit '8fead6912ed3f04867974631935435a887ed889d' into eclair

* commit '8fead6912ed3f04867974631935435a887ed889d':
  incremental OTAs should remove /system/recovery.img
2009-08-24 13:39:30 -07:00
Android (Google) Code Review
8fead6912e Merge change 22448 into donut
* changes:
  incremental OTAs should remove /system/recovery.img
2009-08-24 10:36:06 -07:00
Doug Zongker
3b949f0725 incremental OTAs should remove /system/recovery.img
This file has been replaced by the recovery_from_boot.p patch file,
but needs to be removed from existing devices if it exists.
2009-08-24 10:24:32 -07:00
Scott Main
d59c2ce372 am aab0d4c9: am 72a5cc82: Merge change 22354 into donut
Merge commit 'aab0d4c9f9c175a287aca3954921cbf7731bf1f7'

* commit 'aab0d4c9f9c175a287aca3954921cbf7731bf1f7':
  docs only.
2009-08-22 07:50:38 -07:00
Scott Main
4fcef1e3bf am 102400f8: am eca5e16e: Merge change 22348 into donut
Merge commit '102400f8e235e066bde697f8165b9b0d35e59ac7'

* commit '102400f8e235e066bde697f8165b9b0d35e59ac7':
  docs only.
2009-08-22 07:50:35 -07:00
Scott Main
aab0d4c9f9 am 72a5cc82: Merge change 22354 into donut
Merge commit '72a5cc829038254988054046c302550d6821a300' into eclair

* commit '72a5cc829038254988054046c302550d6821a300':
  docs only.
2009-08-22 07:44:20 -07:00
Scott Main
102400f8e2 am eca5e16e: Merge change 22348 into donut
Merge commit 'eca5e16e057cc6915c07ea4138929c44a013aba6' into eclair

* commit 'eca5e16e057cc6915c07ea4138929c44a013aba6':
  docs only.
2009-08-22 07:44:16 -07:00
Android (Google) Code Review
72a5cc8290 Merge change 22354 into donut
* changes:
  docs only. add donut image for homepage announcement.
2009-08-21 16:38:35 -07:00
Scott Main
37a4d1cb5c docs only.
add donut image for homepage announcement.
2009-08-21 16:37:09 -07:00
Android (Google) Code Review
eca5e16e05 Merge change 22348 into donut
* changes:
  docs only. remove preliminary watermak
2009-08-21 16:12:25 -07:00
Scott Main
d22b5e108d docs only.
remove preliminary watermak
2009-08-21 16:11:02 -07:00
Doug Zongker
98cb09e37a am 1f8b697a: am e05628cc: fix signing user builds
Merge commit '1f8b697a7fc3102e495972fec0d8bca7e5698098'

* commit '1f8b697a7fc3102e495972fec0d8bca7e5698098':
  fix signing user builds
2009-08-20 18:23:05 -07:00
Doug Zongker
1f8b697a7f am e05628cc: fix signing user builds
Merge commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008' into eclair

* commit 'e05628cc8df4ec4b69befa9652d81eb81f0ab008':
  fix signing user builds
2009-08-20 18:18:29 -07:00
Doug Zongker
e05628cc8d fix signing user builds
When unzipping a target-files which has been signed with OTA key
replacement, you'll get "overwrite this file?" prompts because the key
files appear in the zip files twice.  Suppress these prompts.

Many developer phone products don't define PRODUCT_OTA_PUBLIC_KEYS, so
add a default key.

This change doesn't affect device code.
2009-08-20 18:02:47 -07:00
Dirk Dougherty
9e85734425 am 724735d2: am 6f7ba2dc: Merge change 20234 into donut
Merge commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b'

* commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b':
  Remove extraneous quotation mark in template file
2009-08-20 10:41:02 -07:00
Dirk Dougherty
724735d2be am 6f7ba2dc: Merge change 20234 into donut
Merge commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276' into eclair

* commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276':
  Remove extraneous quotation mark in template file
2009-08-20 10:36:47 -07:00
Android (Google) Code Review
6f7ba2dce2 Merge change 20234 into donut
* changes:
  Remove extraneous quotation mark in template file
2009-08-20 10:33:11 -07:00
Scott Main
aeb8fd7ee1 am f036631b: am 54161d14: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item.
Merge commit 'f036631b02bca65818cc02767c5389e5de1f67a8'

* commit 'f036631b02bca65818cc02767c5389e5de1f67a8':
  DOCS ONLY.
2009-08-19 12:16:10 -07:00
Scott Main
f036631b02 am 54161d14: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item.
Merge commit '54161d143931c5be2d49e8f9f215ec8bff2237af' into eclair

* commit '54161d143931c5be2d49e8f9f215ec8bff2237af':
  DOCS ONLY.
2009-08-19 11:05:04 -07:00