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).
Merge commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589'
* commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589':
AI 150083: Minor updates to the ndk docs based on approved messaging.
* 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.
Merge commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61'
* commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61':
Fixed PDK links that point to the Creative Commons License
@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
@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.
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)
Merge commit 'a2bd9af94757e73a4ff4c1fe8c98b4174b008b62'
* commit 'a2bd9af94757e73a4ff4c1fe8c98b4174b008b62':
Removing top tabs from PDK navigation because right now we only have one section.
Merge commit '9454b1c8b6d36e56b749bed06cfe7afb04a32375'
* commit '9454b1c8b6d36e56b749bed06cfe7afb04a32375':
- Changed page title to show "Android open source"
Merge commit '398814fa75ee05ba9e77dd0057c469cc92ffd73e'
* commit '398814fa75ee05ba9e77dd0057c469cc92ffd73e':
AI 149839: make the home page's announcement block expandable...
Merge commit '5eb5832751cad87021b9f1ad77f1c26952030884' into donut
* commit '5eb5832751cad87021b9f1ad77f1c26952030884':
AI 149839: make the home page's announcement block expandable...
primarily, this is to handle various lengths of text due to translations,
but also allows us to be more flexible WRT the content for the top section.
Automated import of CL 149839
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.
Merge commit '39528d6bace1457d21e76824fe94d85c880fe4be'
* commit '39528d6bace1457d21e76824fe94d85c880fe4be':
fix the SDK build for real this time.
support incremental updates of boot image
* changes:
Implements the basic structure for providing localized documentation; the site tabs are now in a separate file to ease the translation process, the language selection menu has been added to the header, scripts have been added to dynamically switch the language of the site tabs and dev guide side navigation and save the language preference in a browser cookie, and some of the functions in macro.cs have moved into customization.cs.
the site tabs are now in a separate file to ease the translation process,
the language selection menu has been added to the header,
scripts have been added to dynamically switch the language of the
site tabs and dev guide side navigation and save the language
preference in a browser cookie,
and some of the functions in macro.cs have moved into customization.cs.
patch 2:
revised the logic for changing tab and nav languages so that,
in the event that a SPAN node exists for the newly selected language
but the translation has not actually been put there, it will not be selected
and the previously selected language will remain for that node.
patch 3:
revised the logic introduced in patch 2, which, when loading a new page
would actually reveal all languages if the selected language had no
translation. Now, we must loop through each occurance and check whether
a translation is available. If not, then we hide it and show English.
patch 4:
small error fix
Merge commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55'
* commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55':
AI 148870: Pinging Ryan for Dr No approval.
---
Cloned from CL 147240 by 'g4 patch'.
Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50.
"Making PDK work in SDK environment."
This CL should be pretty straight forward and should be touching only PDK
related templates, etc. Turns out we no longer need to touch the highlightNav
code.
Automated import of CL 148870
Merge commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c'
* commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c':
AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
add vertical padding to quickview list items so that items are distinguishable when the text wraps-around the line
BUG=1790235
Automated import of CL 148820
