Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'
* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
Reapply modifications from 3175 to fix display of navTree in doc output.
Merge commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16'
* commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16':
AI 150131: Remove English/Chinese IME from OpenWnn.
Merge commit 'df09424f19ca8d455037b19641b15a7c55d9523f'
* commit 'df09424f19ca8d455037b19641b15a7c55d9523f':
Patch 2: some fixes to the developer-docs stylesheet....
the first argument is the executable (here findleaves.sh), therefore we
need to start popping from the 2nd argument (1).
Conflicts:
tools/findleaves.sh
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 'da0696187b6927270a6b8a15785aaa328c3030bd'
* commit 'da0696187b6927270a6b8a15785aaa328c3030bd':
AI 150470: CTS: Fix naming for extra permission tests and include them in makefile
AI 150428: update the jquery library to version 1.3.2.
AI 150398: fix the sdk build break
AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
AI 150389: Fix handling of cookie writes for intl pages.
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 '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 '9e202af99c02b2dc45114b566ea20799e77c73fb'
* commit '9e202af99c02b2dc45114b566ea20799e77c73fb':
AI 150131: Remove English/Chinese IME from OpenWnn.
Merge commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589'
* commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589':
AI 150083: Minor updates to the ndk docs based on approved messaging.
