Merge commit 'c3467e43febbc39cbb43afe25dd988641e2f0218' into eclair-plus-aosp
* commit 'c3467e43febbc39cbb43afe25dd988641e2f0218':
docs: change the ADP image for the homepage carousel
Merge commit '4cdb7149127d9527411ed73e26604a2cf2292435' into eclair
* commit '4cdb7149127d9527411ed73e26604a2cf2292435':
docs: change the ADP image for the homepage carousel
all the source code pages are NOT generated for the offline version
of the docs (only show source in html for online docs).
This won't work until a companion change from framwork/base/Android.mk
is submitted (but shouldn't break the build).
Change-Id: I06c404540870071c2a5a8aa460e156506fd975cb
Merge commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d'
* commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d':
docs: revise user agent detection to use lower case
Merge commit '7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8' into eclair-mr2-plus-aosp
* commit '7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8':
docs: revise user agent detection to use lower case
Merge commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd' into eclair-mr2
* commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd':
docs: revise user agent detection to use lower case
Merge commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd' into eclair-plus-aosp
* commit 'c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd':
docs: revise user agent detection to use lower case
Merge commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961' into eclair
* commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961':
docs: revise user agent detection to use lower case
Merge commit '952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3' into eclair-mr2-plus-aosp
* commit '952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3':
sdk doc change for esr: update version refs to 2.0.1.
Merge commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-mr2
* commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
sdk doc change for esr: update version refs to 2.0.1.
Merge commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-plus-aosp
* commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
sdk doc change for esr: update version refs to 2.0.1.
Merge commit '2570dac37bea232ed28b2322beb0407ed19b15f1'
* commit '2570dac37bea232ed28b2322beb0407ed19b15f1':
docs: make all javadoc reference links use <code>
Merge commit '7239d522c59661129850d818fe6986074b6aa002' into eclair-mr2-plus-aosp
* commit '7239d522c59661129850d818fe6986074b6aa002':
docs: make all javadoc reference links use <code>
Merge commit 'ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-plus-aosp
* commit 'ec9baf22a959af85f77f56360e95a738f360c4f0':
docs: make all javadoc reference links use <code>
Merge commit 'ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-mr2
* commit 'ec9baf22a959af85f77f56360e95a738f360c4f0':
docs: make all javadoc reference links use <code>
Merge commit '9a5c84020595eac7e20fce036a9afd7c06766457' into eclair
* commit '9a5c84020595eac7e20fce036a9afd7c06766457':
docs: make all javadoc reference links use <code>
Merge commit '002d1c24b4dee2582e660f80669176c4a3e2db33' into eclair-mr2-plus-aosp
* commit '002d1c24b4dee2582e660f80669176c4a3e2db33':
Support secondary CPU ABI in build.prop
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-plus-aosp
* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2
* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
Merge commit 'd628eacae7af10c520df98323250b385212270ca' into eclair-mr2-plus-aosp
* commit 'd628eacae7af10c520df98323250b385212270ca':
allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-mr2
* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-plus-aosp
* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
allow use of unzip version 6.0
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.)
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.
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.
Merge commit '47f77397bed3c381101423d143e83b2cc7e27b49'
* commit '47f77397bed3c381101423d143e83b2cc7e27b49':
docs: revise resizing scripts to better organize the
Merge commit '747f2997f1ddeac97090ce1d94d04eed9cffc529' into eclair-mr2-plus-aosp
* commit '747f2997f1ddeac97090ce1d94d04eed9cffc529':
docs: revise resizing scripts to better organize the
Merge commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00' into eclair-plus-aosp
* commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00':
docs: revise resizing scripts to better organize the
Merge commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00' into eclair-mr2
* commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00':
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.
Merge commit '4d3aa886dbafcc76e0a5fa6b947a98395beb836e' into eclair-mr2-plus-aosp
* commit '4d3aa886dbafcc76e0a5fa6b947a98395beb836e':
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.
Merge commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245' into eclair-plus-aosp
* commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245':
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.
Merge commit '8d89f800ceb04a726597779be845cc45090c8c46'
* commit '8d89f800ceb04a726597779be845cc45090c8c46':
docs: fix IE6 bug in which tabs are not focusable
Merge commit '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348' into eclair-mr2-plus-aosp
* commit '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348':
docs: fix IE6 bug in which tabs are not focusable
Merge commit '32b505d984ed15156b87482f849b865892b57ac2' into eclair-mr2
* commit '32b505d984ed15156b87482f849b865892b57ac2':
docs: fix IE6 bug in which tabs are not focusable
Merge commit '32b505d984ed15156b87482f849b865892b57ac2' into eclair-plus-aosp
* commit '32b505d984ed15156b87482f849b865892b57ac2':
docs: fix IE6 bug in which tabs are not focusable
Merge commit '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d'
* commit '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d':
docs: add checkbox to toggle the api level filter on and off;
Merge commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f' into eclair-mr2-plus-aosp
* commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f':
docs: add checkbox to toggle the api level filter on and off;
Merge commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-mr2
* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
docs: add checkbox to toggle the api level filter on and off;
Merge commit '12313686fb731e79224067ed13749c2c4dae4256' into eclair-mr2-plus-aosp
* commit '12313686fb731e79224067ed13749c2c4dae4256':
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.
Merge commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-plus-aosp
* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
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.
Merge commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-plus-aosp
* commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'c41d251615431a36fc3b664d2bdbe749702a11d9'
* commit 'c41d251615431a36fc3b664d2bdbe749702a11d9':
docs: change javascript so that SDK docs that are not
Merge commit '11cb880f1ef5296cb9eb1aff478808248eb7fe6b' into eclair-mr2-plus-aosp
* commit '11cb880f1ef5296cb9eb1aff478808248eb7fe6b':
docs: change javascript so that SDK docs that are not
Merge commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9' into eclair-plus-aosp
* commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
docs: change javascript so that SDK docs that are not
Merge commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9' into eclair-mr2
* commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
docs: change javascript so that SDK docs that are not
Merge commit '7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db' into eclair-mr2-plus-aosp
* commit '7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db':
docs: add eclair logo for homepage
Merge commit 'f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-plus-aosp
* commit 'f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
Merge commit 'f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-mr2
* commit 'f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
Merge commit '5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb' into eclair-mr2-plus-aosp
* commit '5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb':
stop adding ota-rel-keys tag when signing
Merge commit '160028f8325e9e1face3fc6f17baef498ee3e53d'
* commit '160028f8325e9e1face3fc6f17baef498ee3e53d':
move recovery image to the top of the OTA package
Merge commit 'fb74a21f4792e08c1ebee5d0347698885e31d805'
* commit 'fb74a21f4792e08c1ebee5d0347698885e31d805':
Speed up warn.py about 30x by precompiling all the regular expressions.
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-plus-aosp
* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
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.
Merge commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-plus-aosp
* commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
Speed up warn.py about 30x by precompiling all the regular expressions.
Merge commit '95035daffba91e776734c927c01d104c4478bd9e'
* commit '95035daffba91e776734c927c01d104c4478bd9e':
revise the deprecated warning to use the 'caution'
Merge commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9' into eclair-plus-aosp
* commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9':
revise the deprecated warning to use the 'caution'
Merge commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4' into eclair-plus-aosp
* commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4':
Add NDK version reference to template.
Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair
* commit '7259bae08d7915c0d5ba6427c815d7576c0ef045':
Add NDK version reference to template.
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).
Merge commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f' into eclair-plus-aosp
* commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f':
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.
Merge commit 'a785cb55aa40c4bd251a528edb169d6e1a865169'
* commit 'a785cb55aa40c4bd251a528edb169d6e1a865169':
integrate bsdiff into imgdiff, instead of using subprocess
Merge commit '2bd8abc7c676b28bc34294f6b0be28d98520029f' into eclair-plus-aosp
* commit '2bd8abc7c676b28bc34294f6b0be28d98520029f':
integrate bsdiff into imgdiff, instead of using subprocess
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).
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.)
Merge commit '93c80c4f073811a8fab78e8b56fc2eef87aa0707'
* commit '93c80c4f073811a8fab78e8b56fc2eef87aa0707':
adds a parameter to the URL hash on all search queries.
Merge commit '0c44a2a9f3fb4a6be94bfaa4f00cbccca1dbb57c' into eclair-plus-aosp
* commit '0c44a2a9f3fb4a6be94bfaa4f00cbccca1dbb57c':
adds a parameter to the URL hash on all search queries.
Merge commit 'ad4d4efac403eeba5d648f172aca46c3ad7962c5' into eclair
* commit 'ad4d4efac403eeba5d648f172aca46c3ad7962c5':
adds a parameter to the URL hash on all search queries.
* 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
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.
Merge commit '4b7dd3e36c949729464029480ca41753c122d7f0' into eclair-plus-aosp
* commit '4b7dd3e36c949729464029480ca41753c122d7f0':
improve the OTA progress bar
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
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.
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
Merge commit '31d002062e3735767401a26728e8bd5807095532'
* commit '31d002062e3735767401a26728e8bd5807095532':
Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit '60bbe187da1e0b5aa753c3611e81cbb61f886599' into eclair-plus-aosp
* commit '60bbe187da1e0b5aa753c3611e81cbb61f886599':
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.
Merge commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f' into eclair-plus-aosp
* commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f':
Bug in Mac build where it gets confused over case, fix no longer needed.
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
Merge commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp
* commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83':
Add support for @pending annotation.
Merge commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2' into eclair-plus-aosp
* commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2':
Add missing @Override to DroidDoc and ApiCheck
This behaves the same as @hide, but can be used to annotate API that are
only hidden pending API approval.
Change-Id: I4c0bf46c6d74ed45a8890ecdfd9b14ce234a5c18
Merge commit '0646e78e9969762ead938f953c7283d984333d99'
* commit '0646e78e9969762ead938f953c7283d984333d99':
do a pass of normal-chunk-merging before comparing src and tgt files
