Commit graph

1444 commits

Author SHA1 Message Date
Android (Google) Code Review
6f7ba2dce2 Merge change 20234 into donut
* changes:
  Remove extraneous quotation mark in template file
2009-08-20 10:33:11 -07:00
Scott Main
aeb8fd7ee1 am f036631b: am 54161d14: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item.
Merge commit 'f036631b02bca65818cc02767c5389e5de1f67a8'

* commit 'f036631b02bca65818cc02767c5389e5de1f67a8':
  DOCS ONLY.
2009-08-19 12:16:10 -07:00
Scott Main
f036631b02 am 54161d14: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item.
Merge commit '54161d143931c5be2d49e8f9f215ec8bff2237af' into eclair

* commit '54161d143931c5be2d49e8f9f215ec8bff2237af':
  DOCS ONLY.
2009-08-19 11:05:04 -07:00
Scott Main
54161d1439 DOCS ONLY.
styleheet changes to fix some errors in the print layout
and remove extra space from above nested lists, so they fit
closer to the parent list item.
2009-08-18 19:00:11 -07:00
Jesse Wilson
90c1d538f9 Fixed droiddoc to properly version varargs and type-parameter methods.
This also removes many false-positive warnings in the droiddoc output
from methods whose visibility didn't require documentation.
2009-08-17 14:23:31 -07:00
Gaurav Mathur
f7781090bd am ab28cea5: Frame-work for open source site
Merge commit 'ab28cea58db8b06ee0ffc41db87342487f53c1eb'

* commit 'ab28cea58db8b06ee0ffc41db87342487f53c1eb':
  Frame-work for open source site
2009-08-12 12:36:42 -07:00
Gaurav Mathur
ab28cea58d Frame-work for open source site
modified:   customization.cs
2009-08-11 22:24:15 -07:00
Scott Main
66a3d6dced am 95641e97: fix css image references for offline docs
Merge commit '95641e9759b74fe61ff138970ca8aa2a9f34a080'

* commit '95641e9759b74fe61ff138970ca8aa2a9f34a080':
  fix css image references for offline docs
2009-08-06 02:45:17 -07:00
Scott Main
95641e9759 fix css image references for offline docs 2009-08-06 02:36:50 -07:00
Scott Main
7a09cd61de am fa4765e0: lighten up on "preliminary" watermark
Merge commit 'fa4765e0dc46af4d131fc9e914e114b4f59d4a80'

* commit 'fa4765e0dc46af4d131fc9e914e114b4f59d4a80':
  lighten up on "preliminary" watermark
2009-08-05 23:43:15 -07:00
Scott Main
fa4765e0dc lighten up on "preliminary" watermark 2009-08-05 23:39:08 -07:00
Android (Google) Code Review
af8a3139ca am 11be8c3e: Merge change 20232 into donut
Merge commit '11be8c3e5f2fd950b14bd17af9b67c25a15970f8'

* commit '11be8c3e5f2fd950b14bd17af9b67c25a15970f8':
  Fix broken url in offline preview docs
2009-08-05 22:11:37 -07:00
Android (Google) Code Review
11be8c3e5f Merge change 20232 into donut
* changes:
  Fix broken url in offline preview docs
2009-08-05 22:09:17 -07:00
Android (Google) Code Review
cce4bb5c45 am 89e555f3: Merge change 20222 into donut
Merge commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa'

* commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa':
  Add support for preview SDK handling in doc templates.
2009-08-05 20:46:45 -07:00
Android (Google) Code Review
89e555f3c5 Merge change 20222 into donut
* changes:
  Add support for preview SDK handling in doc templates.
2009-08-05 20:44:28 -07:00
Dirk Dougherty
71904aa403 Remove extraneous quotation mark in template file
Bug: 2031559
2009-08-05 20:35:31 -07:00
Dirk Dougherty
0931432790 Fix broken url in offline preview docs
Bug: 2031159
2009-08-05 20:19:16 -07:00
Dirk Dougherty
82a28818f5 Add support for preview SDK handling in doc templates.
Bug: 2031559
2009-08-05 19:09:16 -07:00
Android (Google) Code Review
007294e261 am 28ab3b12: Merge change 8917 into donut
Merge commit '28ab3b12d38f1e613d92fcee251ef064665dd8c9'

* commit '28ab3b12d38f1e613d92fcee251ef064665dd8c9':
  implement api level toggling
2009-08-05 12:01:29 -07:00
Scott Main
25fda19689 implement api level toggling
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.
2009-08-05 10:43:55 -07:00
Jean-Baptiste Queru
123f82cb0b merge from donut 2009-08-03 07:50:30 -07:00
Android (Google) Code Review
1951d0eed9 am 7ebafd5a: Merge change 9009 into donut
Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'

* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-30 06:56:59 -07:00
Scott Main
a7f49e3b95 am df09424f: 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
Merge commit 'df09424f19ca8d455037b19641b15a7c55d9523f'

* commit 'df09424f19ca8d455037b19641b15a7c55d9523f':
  Patch 2: some fixes to the developer-docs stylesheet....
2009-07-29 16:44:56 -07:00
Dirk Dougherty
3b1ee3789c Reapply modifications from 3175 to fix display of navTree in doc output. 2009-07-29 12:25:44 -07:00
Scott Main
df09424f19 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.
2009-07-28 09:53:59 -07:00
Jean-Baptiste Queru
7c07cf9a82 Merge korg/donut into korg/master
Conflicts:

	core/apicheck_msg_current.txt
	core/combo/linux-arm.mk
	core/prelink-linux-arm.map
	tools/droiddoc/src/ClassInfo.java
2009-07-25 16:58:22 -07:00
Dirk Dougherty
5f07e2908c am 882bbe14: Merge commit \'5db40c6db73db3f4433dd3456107efb4468a4a99\' into manualmergeDroiddoc
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
2009-07-25 10:12:09 -07:00
Scott Main
353f53c1a6 am 1aa2380c: AI 150428: update the jquery library to version 1.3.2. 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
Merge commit '1aa2380c95a107842972f87ce1dfd7be9f859882'

* commit '1aa2380c95a107842972f87ce1dfd7be9f859882':
  AI 150428: update the jquery library to version 1.3.2.
2009-07-25 10:12:06 -07:00
Scott Main
bbd6743f9e am 8576132a: AI 150393: edit the reference\'s navtree highlighting logic to handle intl/ directories BUG=1790234
Merge commit '8576132a38f4242c5f5da3133e832525a70766e6'

* commit '8576132a38f4242c5f5da3133e832525a70766e6':
  AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
2009-07-25 10:12:04 -07:00
Dirk Dougherty
afac918686 am 1cb43f69: AI 150389: Fix handling of cookie writes for intl pages. BUG=1790234
Merge commit '1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4'

* commit '1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4':
  AI 150389: Fix handling of cookie writes for intl pages.
2009-07-25 10:12:03 -07:00
Dirk Dougherty
901dd0074a am 233bc0b8: 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
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).
2009-07-25 10:12:01 -07:00
Android (Google) Code Review
8104c7c4b7 am eaf299f8: Merge change 8339 into donut
Merge commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589'

* commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589':
  AI 150083: Minor updates to the ndk docs based on approved messaging.
2009-07-25 10:11:58 -07:00
Android (Google) Code Review
423ea3e04a am e85be87e: Merge change 3175 into donut
Merge commit 'e85be87ee6e17df30c1cdfee523e8e8f255ebf62'

* commit 'e85be87ee6e17df30c1cdfee523e8e8f255ebf62':
  page load perfomance improvements...
2009-07-25 10:11:56 -07:00
Dirk Dougherty
882bbe1489 Merge commit '5db40c6db73db3f4433dd3456107efb4468a4a99' into manualmergeDroiddoc 2009-07-24 20:31:36 -07:00
Scott Main
1aa2380c95 AI 150428: update the jquery library to version 1.3.2.
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
2009-07-24 18:39:20 -07:00
Scott Main
8576132a38 AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
BUG=1790234

Automated import of CL 150393
2009-07-24 18:39:20 -07:00
Dirk Dougherty
1cb43f69d4 AI 150389: Fix handling of cookie writes for intl pages.
BUG=1790234

Automated import of CL 150389
2009-07-24 18:39:20 -07:00
Dirk Dougherty
233bc0b84a 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).
BUG=1910893

Automated import of CL 150370
2009-07-24 18:39:20 -07:00
Android (Google) Code Review
eaf299f8b4 Merge change 8339 into donut
* changes:
  Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc
2009-07-24 17:40:17 -07:00
Android (Google) Code Review
e85be87ee6 Merge change 3175 into donut
* 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.
2009-07-24 16:04:56 -07:00
Android (Google) Code Review
186f7a049f am 076f0bfb: Merge change 8313 into donut
Merge commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61'

* commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61':
  Fixed PDK links that point to the Creative Commons License
2009-07-23 16:25:46 -07:00
Jesse Wilson
cfcbcf2856 Merge commit '289d80ee' into manualmerge2
Conflicts:
	tools/droiddoc/src/DroidDoc.java
	tools/droiddoc/test/stubs/func.sh
2009-07-23 11:10:14 -07:00
Gaurav Mathur
eea8234481 Fixed PDK links that point to the Creative Commons License 2009-07-22 20:27:12 -07:00
Dirk Dougherty
f267149426 Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc 2009-07-22 19:01:20 -07:00
Jesse Wilson
289d80eee4 Adding version information to DroidDoc. Rather than pulling the version from
@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
2009-07-21 18:09:39 -07:00
Jesse Wilson
5e0dd414ff Adding version information to DroidDoc. Rather than pulling the version from
@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.
2009-07-21 11:06:25 -07:00
Scott Main
5db40c6db7 AI 150594: change the homepage markup and styles to allow variable height in
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
2009-07-21 10:52:11 -07:00
Joe Onorato
b7c41aaad0 Add a separate version of the docs build that only does the stubs.
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)
2009-07-20 11:57:59 -04:00
Dirk Dougherty
efdcda4f90 AI 150537: Add support for language-specific tabs in android developer's blog. Pass the current language pref as an hl=lang url query.
BUG=1910893

Automated import of CL 150537
2009-07-15 16:41:48 -07:00
Dirk Dougherty
d8cfce0ddf AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific.
BUG=1790234

Automated import of CL 150536
2009-07-15 16:37:21 -07:00
Scott Main
3ba448c7f0 AI 150535: add the Videos page to the site
Automated import of CL 150535
2009-07-15 15:38:17 -07:00
Scott Main
33beffba52 AI 150428: update the jquery library to version 1.3.2.
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
2009-07-09 16:27:06 -07:00
Scott Main
4cb0b458b0 AI 150398: fix the sdk build break
BUG=1790234

Automated import of CL 150398
2009-07-08 15:14:05 -07:00
Scott Main
8ebeb52cb0 AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
BUG=1790234

Automated import of CL 150393
2009-07-08 14:45:58 -07:00
Dirk Dougherty
c13d04594c AI 150389: Fix handling of cookie writes for intl pages.
BUG=1790234

Automated import of CL 150389
2009-07-08 14:39:31 -07:00
Dirk Dougherty
4405a23258 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).
BUG=1910893

Automated import of CL 150370
2009-07-07 17:43:27 -07:00
Android (Google) Code Review
d77ccd3f1b am a2bd9af9: Merge change 4759 into donut
Merge commit 'a2bd9af94757e73a4ff4c1fe8c98b4174b008b62'

* commit 'a2bd9af94757e73a4ff4c1fe8c98b4174b008b62':
  Removing top tabs from PDK navigation because right now we only have one section.
2009-07-01 22:43:50 -07:00
Dirk Dougherty
e6be85f5eb AI 150083: Minor updates to the ndk docs based on approved messaging.
BUG=1790234

Automated import of CL 150083
2009-06-24 11:01:03 -07:00
David Warren
66b14d8646 Removing top tabs from PDK navigation because right now we only have one section. 2009-06-19 10:14:37 -07:00
Android (Google) Code Review
99e5671b15 am 9454b1c8: Merge change 4089 into donut
Merge commit '9454b1c8b6d36e56b749bed06cfe7afb04a32375'

* commit '9454b1c8b6d36e56b749bed06cfe7afb04a32375':
  - Changed page title to show "Android open source"
2009-06-17 15:38:54 -07:00
Android (Google) Code Review
9454b1c8b6 Merge change 4089 into donut
* changes:
  - Changed page title to show "Android open source" - Changed Tab name to "Dev Guide"
2009-06-17 10:00:30 -07:00
Scott Main
5386f16364 am 398814fa: am 5eb58327: 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.
Merge commit '398814fa75ee05ba9e77dd0057c469cc92ffd73e'

* commit '398814fa75ee05ba9e77dd0057c469cc92ffd73e':
  AI 149839: make the home page's announcement block expandable...
2009-06-14 21:13:21 -07:00
Scott Main
398814fa75 am 5eb58327: 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.
Merge commit '5eb5832751cad87021b9f1ad77f1c26952030884' into donut

* commit '5eb5832751cad87021b9f1ad77f1c26952030884':
  AI 149839: make the home page's announcement block expandable...
2009-06-14 20:45:16 -07:00
Scott Main
5eb5832751 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
2009-06-12 14:02:40 -07:00
Gaurav Mathur
a0deb0fb7f - Changed page title to show "Android open source"
- Changed Tab name to "Dev Guide"
2009-06-12 13:47:16 -07:00
Scott Main
08d69b0fbc am ed3a2d30: am 88ee3f4e: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300
Merge commit 'ed3a2d303de6110ef93d4570fd64550b31b55caa'

* commit 'ed3a2d303de6110ef93d4570fd64550b31b55caa':
  AI 149729: fix search functionatilty for offline docs...
2009-06-11 01:02:46 -07:00
Scott Main
ed3a2d303d am 88ee3f4e: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300
Merge commit '88ee3f4e032ba9fd0377b80b916dcc39b2ce1bf1' into donut

* commit '88ee3f4e032ba9fd0377b80b916dcc39b2ce1bf1':
  AI 149729: fix search functionatilty for offline docs...
2009-06-11 00:01:30 -07:00
Scott Main
88ee3f4e03 AI 149729: fix search functionatilty for offline docs...
the file references weren't using the local root.
  BUG=1909300

Automated import of CL 149729
2009-06-10 23:40:24 -07:00
Scott Main
5b53cd78cd 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.
2009-06-05 13:54:06 -07:00
Android (Google) Code Review
7cea5343b9 am 39528d6b: Merge change 3004 into donut
Merge commit '39528d6bace1457d21e76824fe94d85c880fe4be'

* commit '39528d6bace1457d21e76824fe94d85c880fe4be':
  fix the SDK build for real this time.
  support incremental updates of boot image
2009-06-02 23:22:21 -07:00
Android (Google) Code Review
39528d6bac Merge change 3004 into donut
* changes:
  fix the SDK build for real this time. the missing macros weren't declared in the proper order last time.
2009-06-02 23:20:15 -07:00
Scott Main
653726a40a fix the SDK build for real this time.
the missing macros weren't declared in the proper order last time.
2009-06-02 20:58:23 -07:00
Android (Google) Code Review
ae8c03d9e7 am 34780ee3: Merge change 2982 into donut
Merge commit '34780ee3b6e9958e87e0d192e156806e3f30940f'

* commit '34780ee3b6e9958e87e0d192e156806e3f30940f':
  fix build break by reincluding empty method calls
2009-06-02 17:40:19 -07:00
Android (Google) Code Review
34780ee3b6 Merge change 2982 into donut
* changes:
  fix build break by reincluding empty method calls that were moved to macros.cs
2009-06-02 17:38:23 -07:00
Scott Main
a0f9bd1ef8 fix build break by reincluding empty method calls
that were moved to macros.cs
2009-06-02 17:35:25 -07:00
Android (Google) Code Review
1604b78091 am 31dae454: Merge change 2146 into donut
Merge commit '31dae454b6c2c137f3218d9fa3d25784f4b3f232'

* commit '31dae454b6c2c137f3218d9fa3d25784f4b3f232':
  Implements the basic structure for providing localized documentation;
2009-06-02 11:38:54 -07:00
Android (Google) Code Review
31dae454b6 Merge change 2146 into donut
* 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.
2009-06-02 11:36:55 -07:00
Scott Main
1043da9c95 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.

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
2009-06-02 10:24:41 -07:00
Dirk Dougherty
650b20507c am 5d1b9731: am 29eafdea: AI 149251: Add 1.x Icon Guidelines doc and template pack. BUG=1790234
Merge commit '5d1b97315763b8a8882b428885342e0cd2817050'

* commit '5d1b97315763b8a8882b428885342e0cd2817050':
  AI 149251: Add 1.x Icon Guidelines doc and template pack.
2009-05-26 10:11:40 -07:00
Dirk Dougherty
5d1b973157 am 29eafdea: AI 149251: Add 1.x Icon Guidelines doc and template pack. BUG=1790234
Merge commit '29eafdea34a5239b25fe82e5cd6debf1a5157c6b' into donut

* commit '29eafdea34a5239b25fe82e5cd6debf1a5157c6b':
  AI 149251: Add 1.x Icon Guidelines doc and template pack.
2009-05-26 10:02:55 -07:00
Dirk Dougherty
29eafdea34 AI 149251: Add 1.x Icon Guidelines doc and template pack.
BUG=1790234

Automated import of CL 149251
2009-05-26 08:40:40 -07:00
Gaurav Mathur
89d037eb8c Modified the image and index URLs to point to guide/index.html now 2009-05-22 10:23:58 -07:00
Gaurav Mathur
f326d14362 Modified the image and index URLs to point to guide/index.html now 2009-05-21 13:35:47 -07:00
Gaurav Mathur
fe93ea7068 am cb08f15b: am ee6df9b4: 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.
Merge commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55'

* commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55':
  AI 148870: Pinging Ryan for Dr No approval.
2009-05-14 16:30:43 -07:00
Gaurav Mathur
ee6df9b4fe 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
2009-05-14 16:02:22 -07:00
Scott Main
0cf91e6565 am cdc13d7: am 9b54792: AI 148820: adjust the "nolist" class to add bott
Merge commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c'

* commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c':
  AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
2009-05-13 17:55:09 -07:00
Scott Main
9b54792d70 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
2009-05-13 17:50:33 -07:00
Dirk Dougherty
74d2e86902 am e9a96dd: am 4e4c919: AI 148759: Add download page for NDK 1.5 r1.
Merge commit 'e9a96dd92c2577b77d3a5e5a0d04dfab6f4af5f2'

* commit 'e9a96dd92c2577b77d3a5e5a0d04dfab6f4af5f2':
  AI 148759: Add download page for NDK 1.5 r1.
2009-05-12 19:03:27 -07:00
Dirk Dougherty
4e4c919539 AI 148759: Add download page for NDK 1.5 r1.
BUG=1790234

Automated import of CL 148759
2009-05-12 15:32:35 -07:00
Dirk Dougherty
40a06d8940 AI 148314: Remove droiddoc code that applies the deprecated state of superclasses to subclasses. This change was originally made in Gerrit 7655. https://review.source.android.com/Gerrit#change,7655
BUG=1827730

Automated import of CL 148314
2009-05-05 13:41:56 -07:00
Dirk Dougherty
199eb2f510 am a19801e: am c521e26: AI 148186: Add support for using custom pdk temp
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
2009-05-01 11:58:55 -07:00
Dirk Dougherty
c521e26640 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
BUG=1646802

Automated import of CL 148186
2009-05-01 11:19:55 -07:00
Dirk Dougherty
dcec263780 am b4abfb9: am 12741f5: AI 147874: Fix format and link errors in docs.
Merge commit 'b4abfb91bf1519af1e2826cc2246f324c06a983c'

* commit 'b4abfb91bf1519af1e2826cc2246f324c06a983c':
  AI 147874: Fix format and link errors in docs.
2009-04-29 11:02:43 -07:00
Scott Main
2d2752fc37 am ee1e5a3: am 6b894c8: AI 147808: add "current sdk" link using the new
Merge commit 'ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5'

* commit 'ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5':
  AI 147808: add "current sdk" link using the new sdk.current variable
2009-04-29 11:02:43 -07:00
Dirk Dougherty
f4042fa8a5 am 9f7d4f2: am 099403d: AI 147796: Add widget design guidelines to new U
Merge commit '9f7d4f2351bf59e7a77d4377add18ffb511bcc55'

* commit '9f7d4f2351bf59e7a77d4377add18ffb511bcc55':
  AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
2009-04-29 11:02:43 -07:00
Dirk Dougherty
1d742186df am 37ca5d1: am 19a4bd1: AI 147710: Add redirects for sdk/preview pages.
Merge commit '37ca5d11b32399b2924f56e5d8e6dc414f8d1018'

* commit '37ca5d11b32399b2924f56e5d8e6dc414f8d1018':
  AI 147710: Add redirects for sdk/preview pages.
2009-04-29 11:02:43 -07:00
Scott Main
0fef90c80e am 3bc7430: am 6190dfe: AI 147615: remove sdk version in parentheses fro
Merge commit '3bc74303857538055b906d1f01077d77e6776248'

* commit '3bc74303857538055b906d1f01077d77e6776248':
  AI 147615: remove sdk version in parentheses from page title
2009-04-29 11:02:43 -07:00
Dirk Dougherty
12741f56ac AI 147874: Fix format and link errors in docs.
BUG=1790234

Automated import of CL 147874
2009-04-27 18:13:09 -07:00
Scott Main
6b894c8cec AI 147808: add "current sdk" link using the new sdk.current variable
BUG=1790234

Automated import of CL 147808
2009-04-26 23:18:20 -07:00
Dirk Dougherty
099403d15d AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
BUG=1790234

Automated import of CL 147796
2009-04-25 23:09:51 -07:00
The Android Open Source Project
98dce16df0 Merge commit 'korg/donut' 2009-04-24 13:54:55 -07:00
Dirk Dougherty
19a4bd164e AI 147710: Add redirects for sdk/preview pages.
BUG=1790234

Automated import of CL 147710
2009-04-24 11:30:32 -07:00
Scott Main
6190dfe937 AI 147615: remove sdk version in parentheses from page title
BUG=1790234

Automated import of CL 147615
2009-04-23 23:08:46 -07:00
Dirk Dougherty
7addbc6d55 Merge branch 'readonly-p4-master' 2009-04-22 00:47:52 -07:00
Dirk Dougherty
8094a1462d AI 147305: am: CL 147303 am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
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
2009-04-22 00:46:34 -07:00
Dirk Dougherty
55534c8568 AI 147297: Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
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
2009-04-21 18:52:37 -07:00
Dirk Dougherty
e7b6e882e5 Merge branch 'readonly-p4-master' 2009-04-20 17:58:00 -07:00
Dirk Dougherty
911e311e4e AI 147058: am: CL 147054 am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
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
2009-04-20 17:56:31 -07:00
Dirk Dougherty
82ed8f8c5e AI 147053: Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
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
2009-04-20 17:54:49 -07:00
Scott Main
7280e2d2e3 Merge branch 'readonly-p4-master' 2009-04-20 11:19:35 -07:00
Scott Main
9cccd821ca AI 146955: am: CL 146953 am: CL 146951 CSS edits for docs;
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
2009-04-20 11:18:15 -07:00
Scott Main
9e54130f3d AI 146951: CSS edits for docs;
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
2009-04-20 11:15:26 -07:00
Dirk Dougherty
1c632f9e73 Merge branch 'readonly-p4-master' 2009-04-18 21:16:22 -07:00
Dirk Dougherty
eb1bbbec81 AI 146575: am: CL 146347 am: CL 146344 g4 integrate -t -i -b platform-1_0-to-cupcake @143529,143529 (doc change)
Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146575
2009-04-18 21:15:08 -07:00
Dirk Dougherty
ed214869ec Merge branch 'readonly-p4-master' 2009-04-18 21:13:35 -07:00
Dirk Dougherty
ecfc2c0285 AI 146574: am: CL 146346 am: CL 146342 g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146574
2009-04-18 21:12:27 -07:00
Dirk Dougherty
a744f1b5a5 AI 146344: g4 integrate -t -i -b platform-1_0-to-cupcake @143529,143529 (doc change)
BUG=1675368

Automated import of CL 146344
2009-04-15 11:32:45 -07:00
Dirk Dougherty
18467173e5 AI 146342: g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
BUG=1675368

Automated import of CL 146342
2009-04-15 11:31:36 -07:00
The Android Open Source Project
e53ceac5e2 Merge commit 'korg/cupcake' 2009-04-14 18:17:59 -07:00
Mike Ritter
ad22128be8 Merge branch 'readonly-p4-master' 2009-04-02 10:37:54 -07:00
Mike Ritter
c47ae940ee AI 144207: am: CL 144166 am: CL 144164 Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
Original author: mritter
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144207
2009-04-02 10:36:49 -07:00
Mike Ritter
6c4cd9e035 AI 144164: Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
BUG=1646802

Automated import of CL 144164
2009-04-01 17:30:12 -07:00
The Android Open Source Project
1379256b55 Merge commit 'korg/cupcake' 2009-03-27 15:30:35 -07:00
Dianne Hackborn
15e0f1afee Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:42 -07:00
The Android Open Source Project
b87fef6336 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:36 -07:00
The Android Open Source Project
f122bec404 auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:42 -07:00
Jean-Baptiste Queru
ccf4b83b02 Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Conflicts:
	core/prelink-linux-arm.map
2009-03-18 16:58:18 -07:00
The Android Open Source Project
fdd3a1020c auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
The Android Open Source Project
2f31293ba7 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -07:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
094268cf8c auto import from //depot/cupcake/@132589 2009-03-03 14:03:52 -08:00
The Android Open Source Project
a9b2249753 auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
The Android Open Source Project
41977d7cd2 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:29 -08:00
The Android Open Source Project
dca10d536d auto import from //branches/cupcake/...@131421 2009-02-13 12:57:48 -08:00
The Android Open Source Project
475fa12ade auto import from //branches/cupcake/...@130745 2009-02-10 15:43:57 -08:00
The Android Open Source Project
e914857b89 Merge branch 'cupcake' 2009-01-20 14:05:22 -08:00
The Android Open Source Project
ed18741e07 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:55 -08:00
The Android Open Source Project
a71fc0a155 Merge branch 'master' of git://android.git.kernel.org/platform/build 2009-01-16 14:38:53 -08:00
The Android Open Source Project
66339ad5ce auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
Mike Hearn
5496ad284d Don't walk the inheritance heirarchy looking for deprecated superclasses.
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.
2009-01-14 17:27:57 +01:00
The Android Open Source Project
4f85cc54b3 auto import from //branches/cupcake/...@125939 2009-01-09 17:50:54 -08:00
The Android Open Source Project
dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
The Android Open Source Project
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00