Merge commit '7350ff3d572624abb5a46c3c4969e0b91cb05109' into eclair
* commit '7350ff3d572624abb5a46c3c4969e0b91cb05109':
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
add Searchable resource information to the Available Resources doc
and update some some of the attribute documentation to indicate
that the icon label is not recommended.
and fixing merge issue...
Change-Id: I1b1a62aa9804f4a0bf2f93328dde90b9f7aec50a
Merge commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3' into eclair
* commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3':
add searchable dictionary to html docs and dev guide nav
add new documentation for installing the new winusb driver.
also add a link to the HTC support site for ADP flashing
and remove references to the G1 and generalize to "consumer devices"
Merge commit 'b385508d89747e4c383979f1cc6fa2814b1cedbd' into eclair
* commit 'b385508d89747e4c383979f1cc6fa2814b1cedbd':
Add more code samples to the online docs.
Add build rules to include the development samples in the droiddoc build process.
Add all the sample screenshots to a new samples/images/ directory
Revise the samples homepage to include links to new samples
add manifest documentation for uses-feature and supports-screens elements.
also update the navigation and manifest home page,
update the uses-sdk element to include new maxSdk and targeSdk attributes,
and add some sample code to DisplayMetrics to query the device for screen info.
Merge commit '11b6a29dfe380c97fa3df67a6b97ff3383592b58'
* commit '11b6a29dfe380c97fa3df67a6b97ff3383592b58':
AI 150594: change the homepage markup and styles to allow variable height in
AI 150587: add a sitemap for translated docs, for submission to Webmaster Tools,
AI 150541: roll the docs forward to 1.5 r3
AI 150538: add note that appwidget updates will wake the device and suggest an alarm
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
Merge commit 'eec841f0505c3aeb5b18e53f48b755ff69b78c15'
* commit 'eec841f0505c3aeb5b18e53f48b755ff69b78c15':
AI 150460: Add missing art files for menu_guidelines doc.
AI 150397: turn off the right arrow in the carousel -- we only have 3 items.
AI 150390: Roll the docs back to 1.5 r2, temporarily.
AI 150381: Add localized content (ja2) to developer site.
AI 150380: Add localized content (ja) for developer site.
AI 150369: Add localized TOCs for developer site.
AI 150351: Doc updates for Android 1.5 SDK r3.
Merge commit '1f4dd5d6ca82bee7c2ac257d61b373f80dcc1354'
* commit '1f4dd5d6ca82bee7c2ac257d61b373f80dcc1354':
AI 150106: Add gcc/gmake/cygwin details to NDK sys requirements
AI 150083: Minor updates to the ndk docs based on approved messaging.
AI 150055: In Icon Guidelines doc, remove example icons that are not accessible to apps.
AI 150054: Misc changes for the sdk/devsite docs
AI 150008: update the Google IO announcement, point to session videos.
Books and web pages seem to prefer the requestWindowFeature method
over the android:theme, despite the advantages of the latter. This
may be because we mention requestWindowFeature but not android:theme
in our FAQ.
(Also add missing end tag to fix page rendering with Chrome.)
