Commit Graph

762 Commits

Author SHA1 Message Date
David 'Digit' Turner 579e12bb6e am e870a487: am 002d1c24: am 31597999: Merge change I2edfb71d into eclair
Merge commit 'e870a487d6679eecca1f19524807cc2215922fb5'

* commit 'e870a487d6679eecca1f19524807cc2215922fb5':
  Support secondary CPU ABI in build.prop
2009-11-11 18:19:48 -08:00
David 'Digit' Turner e870a487d6 am 002d1c24: am 31597999: Merge change I2edfb71d into eclair
Merge commit '002d1c24b4dee2582e660f80669176c4a3e2db33' into eclair-mr2-plus-aosp

* commit '002d1c24b4dee2582e660f80669176c4a3e2db33':
  Support secondary CPU ABI in build.prop
2009-11-11 18:15:08 -08:00
David 'Digit' Turner 0464bc49e1 am 31597999: Merge change I2edfb71d into eclair
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-plus-aosp

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop
2009-11-11 18:13:01 -08:00
David 'Digit' Turner 002d1c24b4 am 31597999: Merge change I2edfb71d into eclair
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop
2009-11-11 18:12:06 -08:00
Android (Google) Code Review 31597999a6 Merge change I2edfb71d into eclair
* changes:
  Support secondary CPU ABI in build.prop
2009-11-11 18:08:03 -08:00
Jean-Baptiste Queru 96c3892fc0 merge from open-source master 2009-11-11 08:19:07 -08:00
Doug Zongker fec674d99c am 4cc57b40: am d628eaca: am f17e6387: allow use of unzip version 6.0
Merge commit '4cc57b40fc6d7e5ee3692dac790254fdb0d2dd5e'

* commit '4cc57b40fc6d7e5ee3692dac790254fdb0d2dd5e':
  allow use of unzip version 6.0
2009-11-10 15:22:49 -08:00
Doug Zongker 4cc57b40fc am d628eaca: am f17e6387: allow use of unzip version 6.0
Merge commit 'd628eacae7af10c520df98323250b385212270ca' into eclair-mr2-plus-aosp

* commit 'd628eacae7af10c520df98323250b385212270ca':
  allow use of unzip version 6.0
2009-11-10 14:52:07 -08:00
Doug Zongker d628eacae7 am f17e6387: allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-mr2

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0
2009-11-10 12:33:31 -08:00
Doug Zongker baa5760a51 am f17e6387: allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-plus-aosp

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0
2009-11-10 12:32:59 -08:00
Elliott Hughes 03ead3365d Teach apicheck about interface methods.
If a method is declared by an interface implemented directly by a class,
or indirectly by any of its superclasses, removing a duplicate declaration
is not an API change.

(This fixes the master build, which is currently broken because getOption
and setOption were removed from DatagramSocketImpl because they were
duplicate declarations of the same methods in the implemented interface
SocketOptions.)
2009-11-09 23:49:43 -08:00
Doug Zongker f17e63879c allow use of unzip version 6.0
Unzip 6.0 changes the name of the fourth column in the "unzip -lv"
output from "Ratio" to "Cmpr".  Allow either name so that
dump-package-stats works with both unzip 5 and unzip 6.
2009-11-09 18:19:48 -08:00
Jey 9af5fc4e44 Support absolute path, in OUT_DIR 2009-11-08 13:19:45 -08:00
David 'Digit' Turner 2edfb71d01 Support secondary CPU ABI in build.prop
BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.

This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.

TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
2009-11-06 15:12:00 -08:00
Dan Morrill 8a0625bcb8 Work in progress snapshot of the refreshed content for source.android.com
(formerly PDK).
2009-11-06 14:06:06 -08:00
Scott Main 9a5c840205 docs: make all javadoc reference links use <code>
and remove some unused CSS
2009-11-04 16:12:05 -08:00
Scott Main a072b4f780 am 47f77397: am 747f2997: am 24fbbfaa: am 3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '47f77397bed3c381101423d143e83b2cc7e27b49'

* commit '47f77397bed3c381101423d143e83b2cc7e27b49':
  docs: revise resizing scripts to better organize the
2009-11-03 19:32:27 -08:00
Scott Main 47f77397be am 747f2997: am 24fbbfaa: am 3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '747f2997f1ddeac97090ce1d94d04eed9cffc529' into eclair-mr2-plus-aosp

* commit '747f2997f1ddeac97090ce1d94d04eed9cffc529':
  docs: revise resizing scripts to better organize the
2009-11-03 19:22:34 -08:00
Scott Main c72d16092e am 24fbbfaa: am 3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00' into eclair-plus-aosp

* commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00':
  docs: revise resizing scripts to better organize the
2009-11-03 19:13:05 -08:00
Scott Main 747f2997f1 am 24fbbfaa: am 3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00' into eclair-mr2

* commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00':
  docs: revise resizing scripts to better organize the
2009-11-03 19:12:40 -08:00
Scott Main d8115ffb22 docs: revise user agent detection to use lower case
for string comparisons and add 'webos' as a mobile device
2009-11-03 18:54:26 -08:00
Scott Main 3f7d1df129 docs: revise resizing scripts to better organize the
tasks into chunks that are only executed when necessary.

Move the stuff that does the reference panel resizing
into a separate method because this should only happen when
literally resizing the panels. This thus resolves the problem
in which an invalid cookie would sometimes be written during
a normal window resize event -- there's no need to write that
cookie unless the user literally resizes the panel.

There's no need to call resizeWidth all the time, the doc-content
div can manage its width by inheritence and should only ever have
to resize its left margin when the side nav is manually resized or
when the page is loaded (in order to account for a saved side nav
width). This vastly improves the performance and visual quality
when resizing. However, IE6 still requires this in order for the scrollbars
to be visible in the content area. So a flag is now set when IE6 is
the browser, it has its own onresize method
and the width is defined only for IE6.

Inside resizeHeight, check what the href path is before doing any
resizing, just to make sure we don't do unecessary work and to
make the code more readable.
2009-11-02 20:06:04 -08:00
Scott Main 54f99f57e6 am 034a1089: am 4d3aa886: am ec4194ef: am 64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '034a10891facd6e334be71b515e1d65c281f4278'

* commit '034a10891facd6e334be71b515e1d65c281f4278':
  docs: fix js error when there's no api level cookie saved.
2009-11-02 19:08:25 -08:00
Scott Main 034a10891f am 4d3aa886: am ec4194ef: am 64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '4d3aa886dbafcc76e0a5fa6b947a98395beb836e' into eclair-mr2-plus-aosp

* commit '4d3aa886dbafcc76e0a5fa6b947a98395beb836e':
  docs: fix js error when there's no api level cookie saved.
2009-11-02 18:59:08 -08:00
Scott Main 4d3aa886db am ec4194ef: am 64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245' into eclair-mr2

* commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245':
  docs: fix js error when there's no api level cookie saved.
2009-11-02 18:50:09 -08:00
Scott Main 598c2e2eba am ec4194ef: am 64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245' into eclair-plus-aosp

* commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245':
  docs: fix js error when there's no api level cookie saved.
2009-11-02 18:50:03 -08:00
Scott Main 64b879ac5b docs: fix js error when there's no api level cookie saved.
currently, if there's no api level cookie saved, then
the selectedLevelItem variable will be undefined and will
throw an error at the end of the buildApilevelSelector function.
Now, userApiLevel is set to the max level in this case.
2009-11-02 18:05:41 -08:00
Scott Main a521e3eda8 am 8d89f800: am 3f08740b: am 32b505d9: am 8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs.
Merge commit '8d89f800ceb04a726597779be845cc45090c8c46'

* commit '8d89f800ceb04a726597779be845cc45090c8c46':
  docs: fix IE6 bug in which tabs are not focusable
2009-11-01 21:55:23 -08:00
Scott Main 8d89f800ce am 3f08740b: am 32b505d9: am 8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs.
Merge commit '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348' into eclair-mr2-plus-aosp

* commit '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348':
  docs: fix IE6 bug in which tabs are not focusable
2009-10-30 15:25:01 -07:00
Scott Main 3f08740b0c am 32b505d9: am 8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs.
Merge commit '32b505d984ed15156b87482f849b865892b57ac2' into eclair-mr2

* commit '32b505d984ed15156b87482f849b865892b57ac2':
  docs: fix IE6 bug in which tabs are not focusable
2009-10-30 15:15:14 -07:00
Scott Main f5597885eb am 32b505d9: am 8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs.
Merge commit '32b505d984ed15156b87482f849b865892b57ac2' into eclair-plus-aosp

* commit '32b505d984ed15156b87482f849b865892b57ac2':
  docs: fix IE6 bug in which tabs are not focusable
2009-10-30 15:15:00 -07:00
Scott Main 8e44ae9c76 docs: fix IE6 bug in which tabs are not focusable
while in the reference. also increase the minimum
width for the header to avoid line-wrapping of the tabs.
2009-10-30 13:33:39 -07:00
Scott Main a06f395a0a am 4ffcb763: am df0ca900: am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d'

* commit '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-29 01:59:40 -07:00
Scott Main 4ffcb76344 am df0ca900: am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f' into eclair-mr2-plus-aosp

* commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-29 01:51:53 -07:00
Scott Main df0ca90073 am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-mr2

* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-29 01:25:23 -07:00
Scott Main 8866d26c67 am df5e7f7b: am eae4fc96: am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit 'df5e7f7b575bf61b9e94a17dd57ea97bcae07a4e'

* commit 'df5e7f7b575bf61b9e94a17dd57ea97bcae07a4e':
  fix search for offline docs. again.
2009-10-28 23:48:21 -07:00
Dirk Dougherty 3e7a1470c1 am e528cbdc: am 12313686: am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab'

* commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-28 23:48:14 -07:00
Scott Main df5e7f7b57 am eae4fc96: am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit 'eae4fc960cec88f50eea7ae65f85f5722b0ad26b' into eclair-mr2-plus-aosp

* commit 'eae4fc960cec88f50eea7ae65f85f5722b0ad26b':
  fix search for offline docs. again.
2009-10-28 10:42:13 -07:00
Dirk Dougherty e528cbdcb5 am 12313686: am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '12313686fb731e79224067ed13749c2c4dae4256' into eclair-mr2-plus-aosp

* commit '12313686fb731e79224067ed13749c2c4dae4256':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-28 10:42:08 -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
Scott Main a42091e426 am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-plus-aosp

* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-27 17:50:58 -07:00
Scott Main 9b5fdb9c23 docs: add checkbox to toggle the api level filter on and off;
this includes some function renaming for the related scripts.

the checkbox will be unchecked by default, so any users
that currently have an api level filter selected will now
see all apis until they click the checkbox. the old api level
cookie is still saved the same, but the selected value will only
be applied if the checkbox is selected, which has its own cookie
for on or off.
2009-10-27 16:56:08 -07:00
Scott Main 555cca7d31 am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit '836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-plus-aosp

* commit '836a695f01799566969c12d5c83459bdb5d8b2c2':
  fix search for offline docs. again.
2009-10-26 15:50:36 -07:00
Jean-Baptiste Queru b51df61592 merge from open-source master 2009-10-26 15:14:42 -07:00
Scott Main f1bac52fe2 fix search for offline docs. again. 2009-10-26 14:44:48 -07:00
Dirk Dougherty 59de278178 am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-plus-aosp

* commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-26 11:28:19 -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 3f19cc16b6 am 66a27b01: am 214ea8f1: am 3af366dd: am 462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '66a27b01201027e371b74b0eb18572dfb7303238'

* commit '66a27b01201027e371b74b0eb18572dfb7303238':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:32:32 -07:00
Scott Main 66a27b0120 am 214ea8f1: am 3af366dd: am 462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '214ea8f14ee2b62b80905ad038110066f95be84b' into eclair-mr2-plus-aosp

* commit '214ea8f14ee2b62b80905ad038110066f95be84b':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:23:04 -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 a1ff4fccee 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-plus-aosp

* commit '3af366ddb2634f97f440b1437bbd21d00101c93b':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:13:26 -07:00
Scott Main bd4b2f7b7f am c41d2516: am 11cb880f: 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 'c41d251615431a36fc3b664d2bdbe749702a11d9'

* commit 'c41d251615431a36fc3b664d2bdbe749702a11d9':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:29:02 -07:00
Scott Main c41d251615 am 11cb880f: 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 '11cb880f1ef5296cb9eb1aff478808248eb7fe6b' into eclair-mr2-plus-aosp

* commit '11cb880f1ef5296cb9eb1aff478808248eb7fe6b':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:19:06 -07:00
Scott Main de5108cc5e 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-plus-aosp

* commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:08:49 -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 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 3bdae948b1 am ac1e24cc: am 7a0ec6b5: am f963ee63: am 60dba894: docs: add eclair logo for homepage
Merge commit 'ac1e24ccd622b17f5054460b40baad2e07585781'

* commit 'ac1e24ccd622b17f5054460b40baad2e07585781':
  docs: add eclair logo for homepage
2009-10-23 13:32:09 -07:00
Scott Main ac1e24ccd6 am 7a0ec6b5: am f963ee63: am 60dba894: docs: add eclair logo for homepage
Merge commit '7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db' into eclair-mr2-plus-aosp

* commit '7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db':
  docs: add eclair logo for homepage
2009-10-23 13:21:18 -07:00
Scott Main 5719fe7954 am f963ee63: am 60dba894: docs: add eclair logo for homepage
Merge commit 'f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-plus-aosp

* commit 'f963ee638c974942ad99ff4ca9ec985d489e5388':
  docs: add eclair logo for homepage
2009-10-23 13:10:48 -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 60dba89451 docs: add eclair logo for homepage 2009-10-23 12:22:42 -07:00
Doug Zongker e60ff98d3b am 48324393: am 5f5f08dd: stop adding ota-rel-keys tag when signing
Merge commit '4832439384f5b1a58a79cc087655879fbd2f527d'

* commit '4832439384f5b1a58a79cc087655879fbd2f527d':
  stop adding ota-rel-keys tag when signing
2009-10-22 19:06:15 -07:00
Doug Zongker 4832439384 am 5f5f08dd: stop adding ota-rel-keys tag when signing
Merge commit '5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb' into eclair-mr2-plus-aosp

* commit '5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb':
  stop adding ota-rel-keys tag when signing
2009-10-22 16:46:31 -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
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 daeda811ab am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit 'f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-plus-aosp

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

* commit '51da2c573d945d17890e519e7e26a89b2d2f7b51':
  doc change: template/asset changes for sdk package.
2009-10-22 11:31:11 -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
Scott Main 54161d1439 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.
2009-08-18 19:00:11 -07:00
Jesse Wilson 90c1d538f9 Fixed droiddoc to properly version varargs and type-parameter methods.
This also removes many false-positive warnings in the droiddoc output
from methods whose visibility didn't require documentation.
2009-08-17 14:23:31 -07:00
Doug Zongker badd2ca451 fix endianness problem with the tail of the signature comment
The two 0xff bytes were intended to easily distinguish files with
whole file signatures from those without, but I got the endianness
backwards.  Go ahead and fix that, as long as I'm making changes to
the verifier anyway.

Check for a signature that includes the sequence 0x50 0x4b 0x05 0x06,
which looks to minzip like the start of the EOCD block.
2009-08-14 17:15:46 -07:00
Doug Zongker 09cf56001a explicitly set max heap size when running signapk
On the mac, -Xmx defaults to 64MB, which isn't enough to do a
whole-file signing of a full OTA package.
2009-08-14 15:25:06 -07:00
Doug Zongker 951495fc48 update OTA package maker to do whole-file signature
Use the new -w flag to SignApk when signing OTA packages.
2009-08-14 14:07:15 -07:00
Doug Zongker c6cf01a117 add whole-file signature mode to SignApk
Make SignApk generate a signature for (nearly) the entire zip file
when run with the -w option.  The signature covers all of the zip file
except for the archive comment (conveniently the last thing in a zip
file); the archive comment field is used to contain the signature
itself.
2009-08-14 12:25:05 -07:00
Gaurav Mathur f7781090bd am ab28cea5: Frame-work for open source site
Merge commit 'ab28cea58db8b06ee0ffc41db87342487f53c1eb'

* commit 'ab28cea58db8b06ee0ffc41db87342487f53c1eb':
  Frame-work for open source site
2009-08-12 12:36:42 -07:00
Gaurav Mathur ab28cea58d Frame-work for open source site
modified:   customization.cs
2009-08-11 22:24:15 -07:00
Android (Google) Code Review 3b55dfc9a7 Merge change 20816
* changes:
  joeo here -- pesky findleaves.sh wasn't pruning directories.
2009-08-11 15:07:18 -07:00
Andrew Stadler fbe107a8b3 joeo here -- pesky findleaves.sh wasn't pruning directories. 2009-08-11 15:05:59 -07:00
Ben Cheng ab007efd2f Install the generic version of adbs to build/tools. 2009-08-11 11:17:52 -07:00
Joe Onorato 4820a945a5 dedup findleaves output 2009-08-07 11:19:50 -07:00
Joe Onorato d36e945e1a Sort the results of findleaves.
Hopefully this will fix the seemingly random build breakages.
2009-08-06 16:05:02 -07:00
Joe Onorato dc1a728fb8 Rewrite findleaves.sh in python
This cuts the make startup time by about 30 seconds.  Python is faster
than bash in this case, and also we can now supply multiple directories
to prune, and skip the .repo directory, which is, uh, big.

This is from my mac laptop:

$ time build/tools/findleaves.sh --prune="./out" . Android.mk > /dev/null

real    0m29.186s
user    0m0.550s
sys 0m5.897s

$ time build/tools/findleaves.py --prune="./out" . Android.mk > /dev/null

real    0m4.701s
user    0m0.645s
sys 0m1.294s

$ time build/tools/findleaves.py --prune="./out" --prune="./.repo" . Android.mk > /dev/null
real    0m0.176s
user    0m0.094s
sys 0m0.080s
2009-08-06 12:09:21 -07:00
Scott Main 66a3d6dced am 95641e97: fix css image references for offline docs
Merge commit '95641e9759b74fe61ff138970ca8aa2a9f34a080'

* commit '95641e9759b74fe61ff138970ca8aa2a9f34a080':
  fix css image references for offline docs
2009-08-06 02:45:17 -07:00
Scott Main 95641e9759 fix css image references for offline docs 2009-08-06 02:36:50 -07:00
Scott Main 7a09cd61de am fa4765e0: lighten up on "preliminary" watermark
Merge commit 'fa4765e0dc46af4d131fc9e914e114b4f59d4a80'

* commit 'fa4765e0dc46af4d131fc9e914e114b4f59d4a80':
  lighten up on "preliminary" watermark
2009-08-05 23:43:15 -07:00
Scott Main fa4765e0dc lighten up on "preliminary" watermark 2009-08-05 23:39:08 -07:00
Android (Google) Code Review af8a3139ca am 11be8c3e: Merge change 20232 into donut
Merge commit '11be8c3e5f2fd950b14bd17af9b67c25a15970f8'

* commit '11be8c3e5f2fd950b14bd17af9b67c25a15970f8':
  Fix broken url in offline preview docs
2009-08-05 22:11:37 -07:00
Android (Google) Code Review 11be8c3e5f Merge change 20232 into donut
* changes:
  Fix broken url in offline preview docs
2009-08-05 22:09:17 -07:00
Android (Google) Code Review cce4bb5c45 am 89e555f3: Merge change 20222 into donut
Merge commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa'

* commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa':
  Add support for preview SDK handling in doc templates.
2009-08-05 20:46:45 -07:00
Android (Google) Code Review 89e555f3c5 Merge change 20222 into donut
* changes:
  Add support for preview SDK handling in doc templates.
2009-08-05 20:44:28 -07:00
Dirk Dougherty 71904aa403 Remove extraneous quotation mark in template file
Bug: 2031559
2009-08-05 20:35:31 -07:00
Dirk Dougherty 0931432790 Fix broken url in offline preview docs
Bug: 2031159
2009-08-05 20:19:16 -07:00
Dirk Dougherty 82a28818f5 Add support for preview SDK handling in doc templates.
Bug: 2031559
2009-08-05 19:09:16 -07:00
Android (Google) Code Review 007294e261 am 28ab3b12: Merge change 8917 into donut
Merge commit '28ab3b12d38f1e613d92fcee251ef064665dd8c9'

* commit '28ab3b12d38f1e613d92fcee251ef064665dd8c9':
  implement api level toggling
2009-08-05 12:01:29 -07:00
Android (Google) Code Review 28ab3b12d3 Merge change 8917 into donut
* changes:
  implement api level toggling  and rename navtree.js to android-developer-reference.js for all reference related scripts  TODO: shading for hidden classes in the treeview navigation... these aren't dynamic yet.
2009-08-05 11:55:54 -07:00
Scott Main 25fda19689 implement api level toggling
and rename navtree.js to android-developer-reference.js for all reference related scripts
 TODO: shading for hidden classes in the treeview navigation... these aren't dynamic yet.
2009-08-05 10:43:55 -07:00
Doug Zongker 1218b09012 am 1aca962a: allow for malformed imagesizes.txt
Merge commit '1aca962af153d6437937e3e687740d2c1c12657d'

* commit '1aca962af153d6437937e3e687740d2c1c12657d':
  allow for malformed imagesizes.txt
2009-08-04 15:14:01 -07:00
Doug Zongker 1aca962af1 allow for malformed imagesizes.txt
Some builds have blank values for max image sizes; ignore these lines.
2009-08-04 15:09:27 -07:00
Android (Google) Code Review 7d7630cca8 am b6153173: Merge change 9605 into donut
Merge commit 'b6153173952895441e55d0ff6be332bb7c7605e2'

* commit 'b6153173952895441e55d0ff6be332bb7c7605e2':
  use the max image sizes from the target files zip
2009-08-04 14:16:38 -07:00
Android (Google) Code Review b615317395 Merge change 9605 into donut
* changes:
  use the max image sizes from the target files zip
2009-08-04 14:11:15 -07:00
Doug Zongker fdd8e69c42 use the max image sizes from the target files zip
For some time now the build system has included all the max image
sizes in a file in the META directory.  Use these instead of needing
to parse the BoardConfig.mk file for the device at the time of
building an image or OTA package.
2009-08-03 17:27:48 -07:00
Doug Zongker e8cb956b8a am 828bbfb1: in amend, remove symlink targets before creating them
Merge commit '828bbfb18838f04b93ffbed0d7d3b597beaa534c'

* commit '828bbfb18838f04b93ffbed0d7d3b597beaa534c':
  in amend, remove symlink targets before creating them
2009-08-03 16:55:57 -07:00
Doug Zongker 828bbfb188 in amend, remove symlink targets before creating them
amend's symlink command isn't idempotent, so if you restart after the
symlinks have been completed then the second installation attempt will
fail.  Work around this by deleting all symlink targets before
creating symlinks.

Bug: 2020011
2009-08-03 14:11:09 -07:00
Jean-Baptiste Queru 123f82cb0b merge from donut 2009-08-03 07:50:30 -07:00
Marco Nelissen 5236fbde30 Update warn.py with the latest warnings that popped up in the build. 2009-07-31 09:02:11 -07:00
Android (Google) Code Review 1951d0eed9 am 7ebafd5a: Merge change 9009 into donut
Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'

* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-30 06:56:59 -07:00
Scott Main a7f49e3b95 am df09424f: Patch 2: some fixes to the developer-docs stylesheet.... Patch 3: add "Since:" to the api level info Patch 4: fix packages page and styles to reveal class summary
Merge commit 'df09424f19ca8d455037b19641b15a7c55d9523f'

* commit 'df09424f19ca8d455037b19641b15a7c55d9523f':
  Patch 2: some fixes to the developer-docs stylesheet....
2009-07-29 16:44:56 -07:00
Jean-Baptiste Queru 7227ea7619 merge from donut 2009-07-29 14:56:48 -07:00
Android (Google) Code Review 7ebafd5aa0 Merge change 9009 into donut
* changes:
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-29 13:58:07 -07:00
Dirk Dougherty 3b1ee3789c Reapply modifications from 3175 to fix display of navTree in doc output. 2009-07-29 12:25:44 -07:00
Jean-Baptiste Queru 239637eac8 findleaves.sh: Properly fix arguments.
the first argument is the executable (here findleaves.sh), therefore we
need to start popping from the 2nd argument (1).

Conflicts:

	tools/findleaves.sh
2009-07-29 07:35:15 -07:00
Scott Main df09424f19 Patch 2: some fixes to the developer-docs stylesheet....
Patch 3: add "Since:" to the api level info
Patch 4: fix packages page and styles to reveal class summary

Squashed commit of the following:

commit 8fcdcb8dcbe9b93688f5eb1020654848d3242675
Author: Scott Main <smain@google.com>
Date:   Mon Jul 27 09:33:45 2009 -0700

    remove the toggle selector from the header.
    this will be added in a later change with the rest of the toggle script

commit 2423b30ee46c12f92051c4f2a096532e55752c46
Author: Scott Main <smain@google.com>
Date:   Fri Jul 24 16:29:21 2009 -0700

    Implement API Level styles.
    This changes the way we show the API Level for a given package/class/member.
    It also provides hooks in the document to allow us to restyle items
    based on a user-selected API Level (show/hide available items).
    More changes to provide the toggling feature will come soon.

commit efd94b33071070f0dfc2045131b81cbdfe078468
Author: Scott Main <smain@google.com>
Date:   Mon Jul 27 09:33:45 2009 -0700

    remove the toggle selector from the header.
    this will be added in a later change with the rest of the toggle script

commit 3fb79313232c993f700ee90a94f59dcca275fb0b
Author: Scott Main <smain@google.com>
Date:   Fri Jul 24 16:29:21 2009 -0700

    Implement API Level styles.
    This changes the way we show the API Level for a given package/class/member.
    It also provides hooks in the document to allow us to restyle items
    based on a user-selected API Level (show/hide available items).
    More changes to provide the toggling feature will come soon.
2009-07-28 09:53:59 -07:00
Jean-Baptiste Queru 7c07cf9a82 Merge korg/donut into korg/master
Conflicts:

	core/apicheck_msg_current.txt
	core/combo/linux-arm.mk
	core/prelink-linux-arm.map
	tools/droiddoc/src/ClassInfo.java
2009-07-25 16:58:22 -07:00
Dirk Dougherty 5f07e2908c am 882bbe14: Merge commit \'5db40c6db73db3f4433dd3456107efb4468a4a99\' into manualmergeDroiddoc
Merge commit '882bbe1489518cabb661e06f6e87a6561d9239df'

* commit '882bbe1489518cabb661e06f6e87a6561d9239df':
  AI 150594: change the homepage markup and styles to allow variable height in
  AI 150537: Add support for language-specific tabs in android developer's blog. Pass the current language pref as an hl=lang url query.
  AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific.
  AI 150535: add the Videos page to the site
2009-07-25 10:12:09 -07:00
Scott Main 353f53c1a6 am 1aa2380c: AI 150428: update the jquery library to version 1.3.2. the incentive is to utilize an improvement made in the :hidden selector (for the videos page); this update should also hopefully improve some performance, but it is otherwise the same as before
Merge commit '1aa2380c95a107842972f87ce1dfd7be9f859882'

* commit '1aa2380c95a107842972f87ce1dfd7be9f859882':
  AI 150428: update the jquery library to version 1.3.2.
2009-07-25 10:12:06 -07:00
Scott Main bbd6743f9e am 8576132a: AI 150393: edit the reference\'s navtree highlighting logic to handle intl/ directories BUG=1790234
Merge commit '8576132a38f4242c5f5da3133e832525a70766e6'

* commit '8576132a38f4242c5f5da3133e832525a70766e6':
  AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
2009-07-25 10:12:04 -07:00
Dirk Dougherty afac918686 am 1cb43f69: AI 150389: Fix handling of cookie writes for intl pages. BUG=1790234
Merge commit '1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4'

* commit '1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4':
  AI 150389: Fix handling of cookie writes for intl pages.
2009-07-25 10:12:03 -07:00
Dirk Dougherty 901dd0074a am 233bc0b8: AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this
Merge commit '233bc0b84aef261a67a364ff3a8e91077fd70fd6'

* commit '233bc0b84aef261a67a364ff3a8e91077fd70fd6':
  AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css.  DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
2009-07-25 10:12:01 -07:00
Android (Google) Code Review 8104c7c4b7 am eaf299f8: Merge change 8339 into donut
Merge commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589'

* commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589':
  AI 150083: Minor updates to the ndk docs based on approved messaging.
2009-07-25 10:11:58 -07:00
Android (Google) Code Review 423ea3e04a am e85be87e: Merge change 3175 into donut
Merge commit 'e85be87ee6e17df30c1cdfee523e8e8f255ebf62'

* commit 'e85be87ee6e17df30c1cdfee523e8e8f255ebf62':
  page load perfomance improvements...
2009-07-25 10:11:56 -07:00
Dirk Dougherty 882bbe1489 Merge commit '5db40c6db73db3f4433dd3456107efb4468a4a99' into manualmergeDroiddoc 2009-07-24 20:31:36 -07:00
Scott Main 1aa2380c95 AI 150428: update the jquery library to version 1.3.2.
the incentive is to utilize an improvement made in the :hidden selector (for the videos page);
  this update should also hopefully improve some performance, but it is otherwise the same
  as before and this file still includes the core library, plus the UI core and resizable libraries

Automated import of CL 150428
2009-07-24 18:39:20 -07:00
Scott Main 8576132a38 AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
BUG=1790234

Automated import of CL 150393
2009-07-24 18:39:20 -07:00
Dirk Dougherty 1cb43f69d4 AI 150389: Fix handling of cookie writes for intl pages.
BUG=1790234

Automated import of CL 150389
2009-07-24 18:39:20 -07:00
Dirk Dougherty 233bc0b84a AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
BUG=1910893

Automated import of CL 150370
2009-07-24 18:39:20 -07:00
Android (Google) Code Review eaf299f8b4 Merge change 8339 into donut
* changes:
  Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc
2009-07-24 17:40:17 -07:00
Android (Google) Code Review e85be87ee6 Merge change 3175 into donut
* changes:
  page load perfomance improvements... remove the lists.js file from the <head>, which slows down page load a lot (over 300K), and instead load it dynamically on page load. also remove navtree_data.js from the <head>, which also slows the load and is only used in the reference when in tree view. This file is now loaded during the initialization of the nav tree.
2009-07-24 16:04:56 -07:00
Android Git Automerger 358a48e12a merge 73ef8257ce from donut (resolved conflicts) 2009-07-24 12:46:51 -07:00
Android (Google) Code Review ef9f4ea0b8 am 4d7c4348: Merge change 8295 into donut
Merge commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11'

* commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11':
  applypatch changes for patching recovery image
2009-07-23 23:58:04 -07:00
Android (Google) Code Review 186f7a049f am 076f0bfb: Merge change 8313 into donut
Merge commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61'

* commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61':
  Fixed PDK links that point to the Creative Commons License
2009-07-23 16:25:46 -07:00
Doug Zongker 73ef8257ce use a binary patch to install recovery from system
Instead of storing the whole recovery image in system in order to
flash it on first boot, we instead use an imgdiff patch from the boot
image to create the recovery image.  This is substantially smaller
since it effectively only stores the recovery binary and UI images
(the kernel and the init binary are identical to that of the boot
image).

This change modifies the OTA-building script to create and install
these patches, and changes the calculation of the system image size in
the Makefile to reflect the new scheme.
2009-07-23 15:12:53 -07:00
Android (Google) Code Review 4d7c434807 Merge change 8295 into donut
* changes:
  applypatch changes for patching recovery image
2009-07-23 12:38:03 -07:00
Jesse Wilson cfcbcf2856 Merge commit '289d80ee' into manualmerge2
Conflicts:
	tools/droiddoc/src/DroidDoc.java
	tools/droiddoc/test/stubs/func.sh
2009-07-23 11:10:14 -07:00
Gaurav Mathur eea8234481 Fixed PDK links that point to the Creative Commons License 2009-07-22 20:27:12 -07:00
Doug Zongker 6c770467fb applypatch changes for patching recovery image
Make some changes needed to applypatch in order to store the recovery
image in the system partition as a binary patch relative to the boot
image:

  - make applypatch use shared libraries, so it's smaller.  It will
    need to be on the main system so it can install the recovery
    image.  Make an applypatch_static binary for use in recovery
    packages (still needed for updating cupcake devices to donut).

  - output the results of patching to an in-memory buffer and write
    that to the partition; there's no convenient /tmp for us to us.
    (This should be basically a no-op in recovery, since /tmp is a
    ramdisk anyway.)
2009-07-22 19:15:59 -07:00
Dirk Dougherty f267149426 Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc 2009-07-22 19:01:20 -07:00
Doug Zongker 0493e240fd make bootloader requirements optional
Interpret a "*" in the "require version-bootloader" line as "don't
require any specific bootloader".  Sholes OTAs include the bootloader
and the main system in the same package.
2009-07-22 09:28:25 -07:00
Jesse Wilson 289d80eee4 Adding version information to DroidDoc. Rather than pulling the version from
@since tags in the code, it's pulled from the API XML files also used by
apicheck.

The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.

The clearsilver templates will be changed to be pretty in a follow up change.

Conflicts:
	tools/droiddoc/src/DroidDoc.java
2009-07-21 18:09:39 -07:00
Android (Google) Code Review ef5e7dc4dd am 70a76816: Merge change 7944 into donut
Merge commit '70a76816e5268e345a2a52d12c7c0140e9645015'

* commit '70a76816e5268e345a2a52d12c7c0140e9645015':
  better patching for zip files
2009-07-21 14:38:39 -07:00
Android (Google) Code Review 70a76816e5 Merge change 7944 into donut
* changes:
  better patching for zip files
2009-07-21 12:07:35 -07:00
Jesse Wilson 5e0dd414ff Adding version information to DroidDoc. Rather than pulling the version from
@since tags in the code, it's pulled from the API XML files also used by
apicheck.

The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.

The clearsilver templates will be changed to be pretty in a follow up change.
2009-07-21 11:06:25 -07:00
Scott Main 5db40c6db7 AI 150594: change the homepage markup and styles to allow variable height in
the carousel bulletin items
  also move the IO announcement into the carousel and add an ADC2 announcement
  ALSO change the carousel script to write all bulletins to the DOM right away and show/hide them, instead of reading from the JSON and writing to the DOM each time on the fly

Automated import of CL 150594
2009-07-21 10:52:11 -07:00
Doug Zongker 6b2bb3d96d better patching for zip files
Adds a zip mode ("-z") to imgdiff to construct efficient patches for
zip files (including jars and apks).  We identify the regions within
the zip file containing deflated data, and when a corresponding file
can be found in the source zip, a patch is generated for the
uncompressed version of the data.

The GZIP chunk type is replaced with a DEFLATE chunk type that handles
a raw deflated data stream.  This new DEFLATE chunk can be used for
both gzipped pieces (as found within boot and recovery images) and zip
files (apks, etc.)  The gzip header and footer are handled by NORMAL
chunks on either side of the main DEFLATE chunks.  (Typically these
tiny NORMAL chunks will get merged with adjacent chunks, so the number
of output chunks is unaffected.)

Add a test script that tests the generate-apply cycle on all the zips
and images within a pair of full OTA packages.
2009-07-20 14:45:29 -07:00
Joe Onorato b7c41aaad0 Add a separate version of the docs build that only does the stubs.
That way we don't have to wait for clearsilver to write the thousands
of html files during every build.

(This is the build change, there is also a frameworks/base change)
2009-07-20 11:57:59 -04:00
Android (Google) Code Review 4d221e8e28 am ccf9c1da: Merge change 7479 into donut
Merge commit 'ccf9c1da8612d2d9bfb13efb97ceed29c15c83b4'

* commit 'ccf9c1da8612d2d9bfb13efb97ceed29c15c83b4':
  handle identical gzip chunks better
2009-07-16 17:54:18 -07:00
Android (Google) Code Review ccf9c1da86 Merge change 7479 into donut
* changes:
  handle identical gzip chunks better
2009-07-16 13:30:16 -07:00
Doug Zongker 79e4a0b568 am a237874c: fix the modtime of files in the apk when signing
Merge commit 'a237874ccf49e92b93faea51f65c2ff37ea19ac7'

* commit 'a237874ccf49e92b93faea51f65c2ff37ea19ac7':
  fix the modtime of files in the apk when signing
2009-07-15 18:15:19 -07:00
Doug Zongker 3b72436dbe handle identical gzip chunks better
Improve the speed of incremental OTA install by treating unchanging
gzip chunks as normal chunks, avoiding a decompress/recompress cycle.
This reduces the time needed to apply a patch to a boot image where
the kernel has not changed from ~30 seconds to ~2 seconds, on an opal.
2009-07-15 17:54:30 -07:00
Dirk Dougherty efdcda4f90 AI 150537: Add support for language-specific tabs in android developer's blog. Pass the current language pref as an hl=lang url query.
BUG=1910893

Automated import of CL 150537
2009-07-15 16:41:48 -07:00
Dirk Dougherty d8cfce0ddf AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific.
BUG=1790234

Automated import of CL 150536
2009-07-15 16:37:21 -07:00
Doug Zongker a237874ccf fix the modtime of files in the apk when signing
SignApk fixes the timestamp of the signature files it adds.  Use that
same timestamp for all the files, so that the modtime doesn't vary
from build to build.  (Incremental OTAs currently spend significant
time rewriting every .apk to do nothing but patch in timestamp
changes.)
2009-07-15 15:43:39 -07:00