Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair
* commit '7259bae08d7915c0d5ba6427c815d7576c0ef045':
Add NDK version reference to template.
Merge commit '93c80c4f073811a8fab78e8b56fc2eef87aa0707'
* commit '93c80c4f073811a8fab78e8b56fc2eef87aa0707':
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.
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
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 'c66c90a803ef256b5f945d10bd0ddd5abae15d64' into eclair
* commit 'c66c90a803ef256b5f945d10bd0ddd5abae15d64':
Change sdk doc template so that ADT download link bypasses clickthrough.
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
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 '6f7ba2dce2c112eb4be33dbad54751d55ddd2276' into eclair
* commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276':
Remove extraneous quotation mark in template file
Merge commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa'
* commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa':
Add support for preview SDK handling in doc templates.
and rename navtree.js to android-developer-reference.js for all reference related scripts
TODO: shading for hidden classes in the treeview navigation... these aren't dynamic yet.
Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'
* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
Reapply modifications from 3175 to fix display of navTree in doc output.
Merge commit 'df09424f19ca8d455037b19641b15a7c55d9523f'
* commit 'df09424f19ca8d455037b19641b15a7c55d9523f':
Patch 2: some fixes to the developer-docs stylesheet....
Patch 3: add "Since:" to the api level info
Patch 4: fix packages page and styles to reveal class summary
Squashed commit of the following:
commit 8fcdcb8dcbe9b93688f5eb1020654848d3242675
Author: Scott Main <smain@google.com>
Date: Mon Jul 27 09:33:45 2009 -0700
remove the toggle selector from the header.
this will be added in a later change with the rest of the toggle script
commit 2423b30ee46c12f92051c4f2a096532e55752c46
Author: Scott Main <smain@google.com>
Date: Fri Jul 24 16:29:21 2009 -0700
Implement API Level styles.
This changes the way we show the API Level for a given package/class/member.
It also provides hooks in the document to allow us to restyle items
based on a user-selected API Level (show/hide available items).
More changes to provide the toggling feature will come soon.
commit efd94b33071070f0dfc2045131b81cbdfe078468
Author: Scott Main <smain@google.com>
Date: Mon Jul 27 09:33:45 2009 -0700
remove the toggle selector from the header.
this will be added in a later change with the rest of the toggle script
commit 3fb79313232c993f700ee90a94f59dcca275fb0b
Author: Scott Main <smain@google.com>
Date: Fri Jul 24 16:29:21 2009 -0700
Implement API Level styles.
This changes the way we show the API Level for a given package/class/member.
It also provides hooks in the document to allow us to restyle items
based on a user-selected API Level (show/hide available items).
More changes to provide the toggling feature will come soon.
Merge commit '882bbe1489518cabb661e06f6e87a6561d9239df'
* commit '882bbe1489518cabb661e06f6e87a6561d9239df':
AI 150594: change the homepage markup and styles to allow variable height in
AI 150537: Add support for language-specific tabs in android developer's blog. Pass the current language pref as an hl=lang url query.
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 '1aa2380c95a107842972f87ce1dfd7be9f859882'
* commit '1aa2380c95a107842972f87ce1dfd7be9f859882':
AI 150428: update the jquery library to version 1.3.2.
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.
the incentive is to utilize an improvement made in the :hidden selector (for the videos page);
this update should also hopefully improve some performance, but it is otherwise the same
as before and this file still includes the core library, plus the UI core and resizable libraries
Automated import of CL 150428
* 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.
the carousel bulletin items
also move the IO announcement into the carousel and add an ADC2 announcement
ALSO change the carousel script to write all bulletins to the DOM right away and show/hide them, instead of reading from the JSON and writing to the DOM each time on the fly
Automated import of CL 150594
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)
the incentive is to utilize an improvement made in the :hidden selector (for the videos page);
this update should also hopefully improve some performance, but it is otherwise the same
as before and this file still includes the core library, plus the UI core and resizable libraries
Automated import of CL 150428
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
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 '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
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
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.
BUG=1798190
Automated import of CL 146951
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.
