Merge commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a'
* commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a':
docs: add the ability to exclude PRE elements from being prettified
Merge commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e' into eclair-plus-aosp
* commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e':
docs: add the ability to exclude PRE elements from being prettified
by adding the class "no-pretty-print" (needs to hyphenate 'prettyprint',
otherwise the prettify script will parse "no-prettyprint" the same as
"prettyprint")
Merge commit '4bd6c862f0897f99abc227611822e1dace03b6e0'
* commit '4bd6c862f0897f99abc227611822e1dace03b6e0':
docs: hide the "back to top" link when there's no vertical scroll
Merge commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb' into eclair-plus-aosp
* commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb':
docs: hide the "back to top" link when there's no vertical scroll
Merge commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb'
* commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb':
docs: make the Resources docs use the same clearsilver template
Merge commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336' into eclair-plus-aosp
* commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336':
docs: make the Resources docs use the same clearsilver template
Apply the same changes to tags to ro.build.tags that we do for the
tags in the fingerprint (ro.build.fingerprint) and the description
(ro.build.description).
Change-Id: Ie5a057d8f04cbc32d849f91e1f9d2ea7832e81f6
http://b/2363735 - release-key user builds ship with property ro.build.tags == test-keys
Merge commit '915334025e0c7a5b77c387315118e687461e4842'
* commit '915334025e0c7a5b77c387315118e687461e4842':
update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit 'b6da4808699180c608bccef88ddb843411e663c7' into eclair-plus-aosp
* commit 'b6da4808699180c608bccef88ddb843411e663c7':
update for change Ia39d3bb0, which regressed a resizing hack for IE6.
This now will avoid writing the cookie for the width when IE6 calls
resizeWidth() in order to properly resize the doc-content div (other
browsers to not call resizeWidth() for resizing doc-content because it
has auto width, which IE6 does not perform).
Merge commit '83e855494b0b4215c78593efdf69b98c115288f1'
* commit '83e855494b0b4215c78593efdf69b98c115288f1':
docs: fix resizeAll script for IE6 so that the resizeWidth function
Merge commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a' into eclair-plus-aosp
* commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a':
docs: fix resizeAll script for IE6 so that the resizeWidth function
is only called when the side navigation is actually resizable
This stops 'width' cookies from being written for the SDK docs
(and any other page that doesn't have resizable nav) and also adds
some security to the init() function to be sure we properly read
cookie names.
as the Dev Guide. This removes the custom resourcespage.cs file
and routes resources pages to use docpage.cs, while still
setting the resource hdf flag true (in order to highlight the
Resources tab).
Merge commit '99a25fbaa50a077c5d62b9ae204677c176534d8b' into eclair-plus-aosp
* commit '99a25fbaa50a077c5d62b9ae204677c176534d8b':
docs: change DOCTYPE to html5 format
Merge commit 'd79b160d90450068237282393be0d7456cb14bc1'
* commit 'd79b160d90450068237282393be0d7456cb14bc1':
docs for esr: add support for breadcrumbing in the resource docs
Merge commit 'ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53' into eclair-plus-aosp
* commit 'ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53':
docs for esr: add support for breadcrumbing in the resource docs
Merge commit '930ca65a3cde0bf0817e38efee5772338abbf0c0'
* commit '930ca65a3cde0bf0817e38efee5772338abbf0c0':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Merge commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1' into eclair-plus-aosp
* commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing. (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
Merge commit '7b0e85e1814376286c7d036f73241f9a19f70b08'
* commit '7b0e85e1814376286c7d036f73241f9a19f70b08':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp
* commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c':
Add feature list support to DroidDoc.
Merge commit '502c498fec23cb28d16f5e86e981400f76da36ea' into eclair-plus-aosp
* commit '502c498fec23cb28d16f5e86e981400f76da36ea':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.
This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)
Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
Merge commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp
* commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
include pre-signed prebuilt .apks in apkcerts.txt
