Merge commit 'a19801e0600b9016149f56cff05da5a699bf09cc'
* commit 'a19801e0600b9016149f56cff05da5a699bf09cc':
AI 148186: Add support for using custom pdk templates. The make rule for pdk docs should set LOCAL_DROIDDOC_OPTIONS += -hdf android.whichdoc online-pdk
Merge commit 'c521e266406d0393313e17ba29ae519315a5cf6e' into donut
* commit 'c521e266406d0393313e17ba29ae519315a5cf6e':
AI 148186: Add support for using custom pdk templates. The make rule for pdk docs should set LOCAL_DROIDDOC_OPTIONS += -hdf android.whichdoc online-pdk
Merge commit 'b4abfb91bf1519af1e2826cc2246f324c06a983c'
* commit 'b4abfb91bf1519af1e2826cc2246f324c06a983c':
AI 147874: Fix format and link errors in docs.
Merge commit 'ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5'
* commit 'ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5':
AI 147808: add "current sdk" link using the new sdk.current variable
Merge commit '9f7d4f2351bf59e7a77d4377add18ffb511bcc55'
* commit '9f7d4f2351bf59e7a77d4377add18ffb511bcc55':
AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
Merge commit '3bc74303857538055b906d1f01077d77e6776248'
* commit '3bc74303857538055b906d1f01077d77e6776248':
AI 147615: remove sdk version in parentheses from page title
Merge commit 'c33670e1b6961da1d7121b16ef23d10b9f6289d6'
* commit 'c33670e1b6961da1d7121b16ef23d10b9f6289d6':
add -n option to turn off prereq check when build OTA packages
Merge commit '12741f56acf0a8a4feccea537d066ae6882499ce' into donut
* commit '12741f56acf0a8a4feccea537d066ae6882499ce':
AI 147874: Fix format and link errors in docs.
Merge commit '6b894c8cec676cf0811743c864bcb1937714f2c0' into donut
* commit '6b894c8cec676cf0811743c864bcb1937714f2c0':
AI 147808: add "current sdk" link using the new sdk.current variable
Merge commit '099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500' into donut
* commit '099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500':
AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
Merge commit '19a4bd164eec255f62cde30f4afc39f0aeb35c04' into donut
* commit '19a4bd164eec255f62cde30f4afc39f0aeb35c04':
AI 147710: Add redirects for sdk/preview pages.
Merge commit '6190dfe937d9972637129f86858272adcd83bd93' into donut
* commit '6190dfe937d9972637129f86858272adcd83bd93':
AI 147615: remove sdk version in parentheses from page title
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147303
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147305
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
BUG=1790234
Automated import of CL 147297
To support devphone and holiday builds we need more control over the
build fingerprint tags; generalize the -t option so we can arbitrarily
add and remove tags.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147054
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147058
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
BUG=1790234
Automated import of CL 147053
remove preliminary watermark;
remove red color text for warnings;
delete the caution class;
use 1em top-margin only for elements nested in a DD, elements nested in regular
LIs should only be a half em.
Original author: smain
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146955
remove preliminary watermark;
remove red color text for warnings;
delete the caution class;
use 1em top-margin only for elements nested in a DD, elements nested in regular
LIs should only be a half em.
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 146953
remove preliminary watermark;
remove red color text for warnings;
delete the caution class;
use 1em top-margin only for elements nested in a DD, elements nested in regular
LIs should only be a half em.
BUG=1798190
Automated import of CL 146951
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146824
through the key map. Clarify the help for the -e option to
make clear this should happen.
(This change doesn't affect device code.)
Original author: dougz
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146544
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
Original author: joeo
Merged from: //branches/cupcake/...
Automated import of CL 146738
Adds the -t option to sign_target_files_apks, which lets the user
specify extra tags that should be added to the build fingerprint
during the signing process.
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
BUG=1786404
Automated import of CL 146687
through the key map. Clarify the help for the -e option to
make clear this should happen.
(This change doesn't affect device code.)
Original author: dougz
Merged from: //branches/cupcake/...
Automated import of CL 146194
through the key map. Clarify the help for the -e option to
make clear this should happen.
(This change doesn't affect device code.)
Automated import of CL 146193
The build system now (in donut) produces builds that use the testkey
cert for OTA package verification. Change the app-signing script to
also optionally substitute the "real" cert in both the recovery and
system images. Also fix bug where the build fingerprint and
description were not getting properly updated in the recovery
partition.
building images & OTA packages out of vendor/google.
No device code is touched by this change.
Original author: dougz
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 144399
building images & OTA packages out of vendor/google.
No device code is touched by this change.
Original author: dougz
Merged from: //branches/cupcake/...
Automated import of CL 144270
It makes no sense that a class would become deprecated because its superclass
became deprecated - this resulted in nonsensical deprecation warnings for
classes that weren't actually deprecated, like WebView, simply because they
inherited from something that was.