Commit graph

561 commits

Author SHA1 Message Date
Scott Main
7b93f1e506 am 29498430: am a8fcb35e: am e0968f0e: am c426499e: add 2x version of logo for sticky bar
* commit '29498430029f5a4925e37db4abbf8b6fde4d6f4d':
  add 2x version of logo for sticky bar
2014-05-20 18:16:17 +00:00
Scott Main
c426499ee8 add 2x version of logo for sticky bar
Change-Id: I5127d308ee820d4e77798ebe4aaa0f385b797383
2014-05-20 10:11:17 -07:00
Dirk Dougherty
9b9b98376a am 7a62e01c: am 63168fff: am b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit '7a62e01c0baa27d7cff53b4ac4d082710691e8c4':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 18:23:53 +00:00
Dirk Dougherty
ca1230c9a2 Minor fixes for handling cross-browser load issues and positioning of #headings.
Change-Id: I276b07cd85cc0e1edaede027b3dc3e4b1d24dcd7
2014-05-18 22:10:43 -07:00
Dirk Dougherty
5772ce6130 Sync master templates with upstream branch, retain annotation customization from master.
Change-Id: Ie1119bc1b18a017e1bef199949801fb045d8ff06
2014-05-14 15:04:40 -07:00
Dirk Dougherty
efb9987de6 am 8fdd4a0b: am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '8fdd4a0b567878c5cf0aaa9f24496f5888239fea':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:09:39 +00:00
Dirk Dougherty
c3921656f5 Add templates support for dynamic content and sticky nav bar.
Change-Id: Icb4e492a991a19e3e1eac72eafc83623b00be5de
2014-05-14 12:00:34 -07:00
Scott Main
a1cda0e3cf am 4a942fbb: am 35fcac0f: am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen
* commit '4a942fbb4403d0ad9079eb17c6944b7efc19bfd9':
  fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:25:54 +00:00
Scott Main
70c9c2d82b am a36253b8: fix viewport width variable by using underscore instead of hyphen
* commit 'a36253b8b05d94fb27a67522757b07781da2bd43':
  fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:08:18 +00:00
Scott Main
a36253b8b0 fix viewport width variable by using underscore instead of hyphen
Change-Id: I866fa7016453b9e242df5e68f26bf94eac672feb
2014-03-27 12:56:26 -07:00
Scott Main
7964804dd2 am 5429cdc2: am bb3ed6fb: am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
* commit '5429cdc2c84bd753202897a7b3437a7fc522fd8b':
  add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:35:37 +00:00
Scott Main
4f31196420 am 9e81f2c2: am 97d326ea: am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite
* commit '9e81f2c2ece29e97d2ff87440ab18550add5170c':
  Update the sdk templates to support the Android Wear microsite
2014-03-27 03:35:36 +00:00
Scott Main
b8702917c6 am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
* commit '75f21bc79e18f5bdf7676eeab6681e8f4a32e688':
  add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:17:10 +00:00
Scott Main
514c8254d0 am 4b270cdf: Update the sdk templates to support the Android Wear microsite
* commit '4b270cdf3678998370c2c3629711797ec7ab8a5a':
  Update the sdk templates to support the Android Wear microsite
2014-03-27 03:17:09 +00:00
Scott Main
75f21bc79e Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs 2014-03-27 03:15:19 +00:00
Scott Main
e921b6dedc add 2x header logo and add override to viewport width for landing pages.
changing the viewport to 970 ensures proper layout space for floating divs.

Change-Id: Iea980b4dfe1cca8a2b517f171a847a0e2788b1f0
2014-03-26 20:12:35 -07:00
Scott Main
4b270cdf36 Update the sdk templates to support the Android Wear microsite
Change-Id: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-26 19:04:26 -07:00
Ricardo Cervera
ab589ea6eb am 27de0f14: am 816979cc: am d9bc3eda: am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit '27de0f1471daa2f7b35fff41a1fcb04f91dc8c90':
  docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 21:23:54 +00:00
Ricardo Cervera
49b4ef0bad am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
* commit 'fd0be925bb6e34768f9f11cf5325d1fcfbf39410':
  docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:27:48 +00:00
Ricardo Cervera
fd0be925bb docs: Added SDK version to the ADT bundles download path in the CS template.
Change-Id: Ib222684754779b908cb10e6d8f9e5778101c9b96
2014-03-25 12:33:33 -07:00
Scott Main
31fa3772a1 am 7c3e03cf: am ce1ea340: am 7250ac63: am bb79f9d2: am b7b49711: add some css to support android wear sub-site
* commit '7c3e03cfe869b19b9fc566d65a980a6761229d35':
  add some css to support android wear sub-site
2014-03-18 12:46:55 +00:00
Scott Main
bb79f9d2a5 am b7b49711: add some css to support android wear sub-site
* commit 'b7b497115fb19d17a3e5de20646a5eac759c0095':
  add some css to support android wear sub-site
2014-03-18 12:35:42 +00:00
Scott Main
b7b497115f add some css to support android wear sub-site
Change-Id: Ibce2c596219fb86f433075c88a0af9d0cc1007b3
2014-03-18 05:32:26 -07:00
Scott Main
3634c0dfc1 am 0ed897d0: am 83aeb2f9: am e2652df8: am 22866695: am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '0ed897d01536129165f5df63120a791d933a2865':
  set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:16:05 +00:00
Scott Main
228666956a am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '2c2c053490aa3a2102c0dce95fcae0d22b77a71b':
  set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:02:57 +00:00
Scott Main
2c2c053490 set a smaller line height for sidebox headers to avoid whitespace at the top
Change-Id: I8f1c4de275f3d7b2f55460bf4dc32a9a3d6b04ae
2014-02-11 18:16:20 -08:00
Scott Main
062f3564a7 am 22770383: am bb783f27: am a6e8c6c1: am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit '2277038372e0e5c2a3f5c5a90f98eded41bc22a9':
  add 'get started' link to the bottom of class home pages
2014-01-30 01:58:01 +00:00
Scott Main
f72e184689 am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit 'c9e142e62d60b39bb5bd3459358a16c00fc557f3':
  add 'get started' link to the bottom of class home pages
2014-01-29 20:08:49 +00:00
Scott Main
c9e142e62d Merge "add 'get started' link to the bottom of class home pages" into klp-docs 2014-01-29 20:07:13 +00:00
Dirk Dougherty
1f12160606 Add preliminary support for dynamic content js and css.
Change-Id: I1dbc92356e8d4beb712b8872e9b6cf873bdb70be
2014-01-23 19:10:05 -08:00
Scott Main
9ee0fae1e8 add 'get started' link to the bottom of class home pages
Change-Id: I0f4615562efca083e7d1c50bb9e9eaa2cc250ced
2014-01-23 16:43:47 -08:00
Dirk Dougherty
fae3252944 am c3fb41d0: am 2171a443: am 829e4db4: am 0bb2c170: Merge commit \'bb94d790\' into manualmerge
* commit 'c3fb41d0cd7c172934054794368587d6f62b686b':
  Support generated samples_toc.cs file.
2014-01-23 01:09:38 +00:00
Dirk Dougherty
0bb2c1702a Merge commit 'bb94d790' into manualmerge
Conflicts:
	tools/droiddoc/templates-sdk/sample.cs

Change-Id: Ic1640c3620eb6b770bae7766af9ea5c64d74afe0
2014-01-22 17:00:19 -08:00
Dirk Dougherty
bb94d79028 Support generated samples_toc.cs file.
(cherry picked from commit d239e4c9b5)

Change-Id: I3409d7d3beefaacb7d56e15a47597241d257c213
2014-01-23 00:33:49 +00:00
David Friedman
612a88b7fa Added a row for the "All platforms" download line (rebuild stl with debug info package)
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
(cherry picked from commit c25aee2929)
2013-12-19 21:48:29 +00:00
Scott Main
1dc56d66fd am be1c90f5: am 4678625e: am 0707f784: am bf9d72ff: am 07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
* commit 'be1c90f569a3473412344dcc6cfd257398fcbdb5':
  set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
2013-12-19 21:22:21 +00:00
Scott Main
bf9d72ff4d am 07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
* commit '078160410ad4209fb78f59ae8e04a6118914cdb5':
  set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
2013-12-19 21:12:19 +00:00
Scott Main
078160410a set fixed height for header div to ensure the next/prev links
in the training bar are always aligned with TOC

Change-Id: I34bb1967e3677bc94298837b0d8f0c6e7bcd8bbf
2013-12-19 12:56:42 -08:00
Scott Main
b0db3411bc am ade90e43: am da83d321: am b8a5a597: am dab6ac86: am 518dc751: Merge "make the new guide/index.html the link for API Guides." into klp-docs
* commit 'ade90e433384cd26758ec0fcb9809dd2a8d50105':
  make the new guide/index.html the link for API Guides.
2013-12-17 21:36:01 +00:00
Scott Main
dab6ac8601 am 518dc751: Merge "make the new guide/index.html the link for API Guides." into klp-docs
* commit '518dc751a617c1f182cb01cdc8fd06076d1e91ba':
  make the new guide/index.html the link for API Guides.
2013-12-17 21:19:44 +00:00
Scott Main
518dc751a6 Merge "make the new guide/index.html the link for API Guides." into klp-docs 2013-12-17 21:17:29 +00:00
Dirk Dougherty
617253bb22 am b6559177: am 1e9e77cc: am 4d744829: am 9b022bdf: am 35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit 'b6559177b3105e84dde449f8c5c4db519a047552':
  Doc change: Add tag for DevArt.
2013-12-11 23:39:05 +00:00
Dirk Dougherty
9b022bdf8f am 35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '35fe9894d283153b0a72741e207a586ff70cd558':
  Doc change: Add tag for DevArt.
2013-12-11 23:25:13 +00:00
Dirk Dougherty
35fe9894d2 Merge "Doc change: Add tag for DevArt." into klp-docs 2013-12-11 23:22:11 +00:00
Scott Main
d911f7df62 am 13d0294d: am e9c2395f: am f2fbb21d: am ecff92d9: resolved conflicts for merge of 79a55d35 to klp-ub-dev
* commit '13d0294d2dfdfcdf93247ff41fa52b9af1475406':
  add Analytics event to track sample downloads (for real this time)
2013-12-11 21:09:37 +00:00
Scott Main
47dba06bd0 am f96eebf5: am 3ea44ba7: am ab750f31: am ea64d5de: am 719acb45: update search suggestions to use new unified JS and show samples
* commit 'f96eebf52869d2377949cbe858fd48d541a20a27':
  update search suggestions to use new unified JS and show samples
2013-12-11 21:09:36 +00:00
Scott Main
932e3fb991 make the new guide/index.html the link for API Guides.
Change-Id: I4423e9ab43b349427cc70211dd094760b35e9360
2013-12-11 02:02:32 +00:00
Scott Main
ecff92d9f7 resolved conflicts for merge of 79a55d35 to klp-ub-dev
Change-Id: I95f46942e03f125e1a907003520caaf6ab575016
2013-12-10 14:04:30 -08:00
Scott Main
ea64d5de02 am 719acb45: update search suggestions to use new unified JS and show samples
* commit '719acb4553e1ffcbbe452ba7b3e8c6e5a12515db':
  update search suggestions to use new unified JS and show samples
2013-12-10 21:50:34 +00:00
David Friedman
3157a909aa am 986191e8: am d21407ea: am e8db5f69: am c25aee29: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '986191e8327d6b8033686b24579d41f9377934d8':
  Added a row for the "All platforms" download line (rebuild stl with debug info package)
2013-12-10 16:42:06 +00:00
Scott Main
79a55d3585 add Analytics event to track sample downloads (for real this time)
Change-Id: I014fd31f0f12698462d44a8afed96ca6e3cfef38
2013-12-09 17:13:56 -08:00
Scott Main
719acb4553 update search suggestions to use new unified JS and show samples
Change-Id: Id39091558906db7d43b2d07d09756f71d98502a7
2013-12-09 15:57:26 -08:00
David Friedman
c25aee2929 Added a row for the "All platforms" download line (rebuild stl with debug info package)
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
2013-12-09 13:24:13 -08:00
Dirk Dougherty
8f6949b611 Doc change: Add tag for DevArt.
Change-Id: Id6ecac1587e311373b2f787fb86b85c2c9933183
2013-12-03 19:07:13 -08:00
Dirk Dougherty
387aa8b5b1 am fc79229c: am d239e4c9: Support generated samples_toc.cs file.
* commit 'fc79229c7c09058be1064c61c2287cdc7cd366da':
  Support generated samples_toc.cs file.
2013-12-03 01:19:20 +00:00
Dirk Dougherty
d239e4c9b5 Support generated samples_toc.cs file.
Change-Id: I34eeffbc98f729e13de805e7bbb9dac96d13fdd8
2013-12-03 00:16:14 +00:00
Scott Main
8d6e31d944 am c1b340e1: am 927612f4: am 42d6e581: fix the \'to top\' link; it wasn\'t appearing due to a previous CSS change
* commit 'c1b340e1a6aad0f82cff7251379b0583833849d0':
  fix the 'to top' link; it wasn't appearing due to a previous CSS change
2013-11-20 19:46:02 -08:00
Scott Main
42d6e58195 fix the 'to top' link; it wasn't appearing due to a previous CSS change
Change-Id: I00aa080982f5e5d90fd6abcf6e19d41d1727b444
2013-11-20 19:31:26 -08:00
Scott Main
afc4db3b34 make short banners even shorter
also add new "next-docs" style for links at the end of a doc.

Change-Id: I696a01f7614614eec56d9774036559af6bfe0378
(cherry picked from commit 9d6461dfab)
2013-11-21 02:06:29 +00:00
Scott Main
6948b3f40d Merge "make short banners even shorter also add new "next-docs" style for links at the end of a doc." 2013-11-21 02:06:15 +00:00
Scott Main
9d6461dfab make short banners even shorter
also add new "next-docs" style for links at the end of a doc.

Change-Id: I696a01f7614614eec56d9774036559af6bfe0378
2013-11-20 17:57:15 -08:00
Scott Main
697c2fb391 am 0ee84713: am 3956c322: am 2fbc1c95: add analytics event to track sample downloads
* commit '0ee847132b7782839b7c082ea46445315b9ce727':
  add analytics event to track sample downloads
2013-11-20 16:35:46 -08:00
Scott Main
2fbc1c9537 add analytics event to track sample downloads
Change-Id: Ibb6ca88845ca0f26b759503fbca540009e1d7c8c
2013-11-20 15:22:15 -08:00
Scott Main
e189a141c9 am 8b5d96bb: am 01f988f7: am 95cd097f: Merge "add analytics event tracking for SDK tools download" into klp-docs
* commit '8b5d96bb772d1e859d4f7460da9937280aa8d3ca':
  add analytics event tracking for SDK tools download
2013-11-20 13:03:26 -08:00
Scott Main
95cd097f42 Merge "add analytics event tracking for SDK tools download" into klp-docs 2013-11-20 20:57:05 +00:00
Scott Main
c9418f4456 add analytics event tracking for SDK tools download
Change-Id: I6ad2d540a3d496a8f563c22a0778c0f4bbd67f6c
2013-11-20 12:52:22 -08:00
Dirk Dougherty
62440ec22f am 7aa10021: am 8b8a23c6: am bb2b5538: Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
* commit '7aa10021e7f211211e8edd0299114756f0586567':
  Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
2013-11-19 19:25:07 -08:00
Dirk Dougherty
bb2b55381d Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
Change-Id: I368fe1e0004e623cfbdaa39ff74e82f31c9f95d8
2013-11-19 18:26:51 -08:00
Dirk Dougherty
f132f9c177 am ee1934be: am ea994c2a: am 45734df7: Merge "Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var." into klp-docs
* commit 'ee1934be485e6f25fd9b89c8bf415d13326de1ab':
  Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var.
2013-11-18 17:59:48 -08:00
Dirk Dougherty
45734df779 Merge "Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var." into klp-docs 2013-11-19 01:51:12 +00:00
Dirk Dougherty
9b3059f405 Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var.
Change-Id: I6cc7d980e627d3be06f9dee6af4d9e9ebd272577
2013-11-14 13:33:17 -08:00
Scott Main
3af8c20a0a am 82335c87: am 9526eefb: am 4e5b39d8: style adjustment to design/dev/video buttons
* commit '82335c87c1a6295c6de44f0b203b66e4020f51d6':
  style adjustment to design/dev/video buttons
2013-11-13 22:17:58 -08:00
Scott Main
4e5b39d843 style adjustment to design/dev/video buttons
Change-Id: I97a147336805aeb340efcd12009794b02afab681
2013-11-13 16:49:22 -08:00
Scott Main
43ee8eb189 am ab5808b0: am 680821ed: am 13cd8f15: add style for video button in docs
* commit 'ab5808b007f97bf7b8f6d0374c546bddeabb4e16':
  add style for video button in docs
2013-11-12 12:25:57 -08:00
Scott Main
9d288052d0 am ec5b24f4: am faff9f52: am 641c2c2f: clarify the hidden APIs in reference with better tooltips
* commit 'ec5b24f4737ed2c566a8f63b3d27f049a2188a3f':
  clarify the hidden APIs in reference with better tooltips
2013-11-12 12:25:56 -08:00
Scott Main
13cd8f1547 add style for video button in docs
Change-Id: I2f2dcf80aef9c55ad6a11f13549b8dd8709cbc84
2013-11-12 11:55:24 -08:00
Scott Main
641c2c2fda clarify the hidden APIs in reference with better tooltips
Change-Id: Iaa843b4a0462195084fb7a35e826eeec92d50c64
2013-10-31 14:48:45 -07:00
Scott Main
03aca9a712 script to handle new static landing pages for sample topics
Change-Id: If90531da327e2d664ca7856af6a9737ea1879eaa
(cherry picked from commit 241dbd1565)
2013-10-31 16:40:35 +00:00
Scott Main
198bd8fd38 am d2479d2b: am 241dbd15: script to handle new static landing pages for sample topics
* commit 'd2479d2beb6e19072c72e67046caff5d2448e4fb':
  script to handle new static landing pages for sample topics
2013-10-31 07:35:50 -07:00
Scott Main
241dbd1565 script to handle new static landing pages for sample topics
Change-Id: If90531da327e2d664ca7856af6a9737ea1879eaa
2013-10-31 07:27:10 -07:00
Scott Main
e09379cae5 am 70120d0b: am 36ea7a3d: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit '70120d0bffcce16c3c94120fde3cd2c495e5027d':
  remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
2013-10-30 16:45:01 -07:00
Scott Main
f1435b73bd remove the dummy sidenav from samples before populating the real list.
Also make the line numbers hidden before they get moved to avoid
some jankyness during load.

Change-Id: I11c3df6d6c7a9a2e74be938b0f0ec704e71eb8d4
(cherry picked from commit 36ea7a3d74)
2013-10-30 23:33:57 +00:00
Scott Main
36ea7a3d74 remove the dummy sidenav from samples before populating the real list.
Also make the line numbers hidden before they get moved to avoid
some jankyness during load.

Change-Id: I11c3df6d6c7a9a2e74be938b0f0ec704e71eb8d4
2013-10-30 16:29:22 -07:00
Scott Main
05480369c5 am a0df6345: am e9fbac49: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit 'a0df634521840d6d9b154129bb57afe97667f13d':
  make expandable lists under each sample sticky so they don't collapse when opening other project directories.
2013-10-30 15:27:28 -07:00
Scott Main
70557ee5fc make expandable lists under each sample sticky so they don't collapse
when opening other project directories.

change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.

Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
2013-10-30 22:20:53 +00:00
Scott Main
e9fbac49bb make expandable lists under each sample sticky so they don't collapse
when opening other project directories.

change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.

Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
2013-10-30 15:19:41 -07:00
Dirk Dougherty
2fa4c49d7c am 5404ae42: am 3c0c1274: Merge "Add n5 landscape-13 device video frame and css." into klp-dev
* commit '5404ae42e7d982e9bf74fe1bd6e7d4109224e530':
  Add n5 landscape-13 device video frame and css.
2013-10-29 18:32:40 -07:00
Dirk Dougherty
3c0c127468 Merge "Add n5 landscape-13 device video frame and css." into klp-dev 2013-10-30 01:27:10 +00:00
Dirk Dougherty
932f5a3720 am 3b676732: am 57ab9435: Merge "Adjust samples output pages." into klp-dev
* commit '3b676732913c1fcfbf6b948fe4e1a69e42f5faeb':
  Adjust samples output pages.
2013-10-29 16:42:53 -07:00
Dirk Dougherty
57ab94354c Merge "Adjust samples output pages." into klp-dev 2013-10-29 23:35:12 +00:00
Dirk Dougherty
ca1858aca9 Add n5 landscape-13 device video frame and css.
Change-Id: I3b18782680e74bd8d4022e6701bfd61887101cf1
2013-10-29 16:25:00 -07:00
Dirk Dougherty
4bddbb1c77 Adjust samples output pages.
Change-Id: I78a523f218f8733d4a3428e1d54c3c5c471cfa17
2013-10-29 15:42:10 -07:00
Scott Main
5d12ab6b35 am ba5b20eb: am 1a00f7fe: fix \'next\' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
* commit 'ba5b20eb9f1714193780518aa1ac2ac8087fb3b7':
  fix 'next' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
2013-10-29 11:23:47 -07:00
Scott Main
1a00f7fecd fix 'next' links to disable them when at the end of a list.
Also remove the "next class" link at the end of training.

Change-Id: I1d81919a0498d57b451741a7a0c12f011921f2cb
2013-10-29 11:13:26 -07:00
Dirk Dougherty
79cfe50c63 am e45fbe5e: am db932024: Merge "Doc change: css for n5 device video frame." into klp-dev
* commit 'e45fbe5ea73784d2290ff26f6bbd9275743b1135':
  Doc change: css for n5 device video frame.
2013-10-26 17:12:26 -07:00
Dirk Dougherty
d5d3f805e0 Doc change: css for n5 device video frame.
Change-Id: I283c5c7cb3bb84c494b493b333e47f69b2595501
2013-10-26 12:17:44 -07:00
Brett Chabot
44bf9875a1 Merge "Output annotations in sdk package-summary docs." 2013-10-17 17:01:04 +00:00
Scott Main
6c030b7361 fix javadoc sidenav so it does not cutoff overflowing link names
Change-Id: I48f3a7cf4715061702c0a0c7537fa1b09734c62a
2013-10-16 17:04:37 -07:00
Brett Chabot
7678688f37 Output annotations in sdk package-summary docs.
Bug 10749552
Bug 6333357

Change-Id: I57e97ee69d41bb8df5ea371a766ebb7e0602ff90
2013-10-15 20:41:49 -07:00
Scott Main
25c89dda9f enable auto-linking to next lesson with 'next-page-link' css class
Change-Id: I9f4068a4b0921eee28eee3258b72e5f3ad48a64d
2013-10-14 13:07:55 -07:00
Scott Main
40de323797 add support for custom <head> tags in each file with page.customHeadTag HDF var
Change-Id: I377910acec78c600d20cf10ca6aa706750107093
2013-09-20 09:09:40 -07:00
Scott Main
e624b3fa47 update the init_google_navtree2 method to handle new format for sample nav tree data.
and update highlighting logic to handle hashtags

Change-Id: I77de8faaaeed12317aa83086df8273648a1ff00a
2013-09-13 17:04:39 -07:00
Scott Main
2552239a52 fix most of size problems of DAC on handsets.
set device-width for viewport tag

Change-Id: I87854bfac990d277ba95cc7bcf37799c7f36a0ee
2013-09-09 18:51:49 -07:00
Dirk Dougherty
243ffc5bc2 Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs 2013-09-06 18:41:44 +00:00
Dirk Dougherty
f2bd4eb26a Build file breadcrumb from parentdirs keys, optionally linkify.
Change-Id: I7f4c9887d77c6d3ab1aca4e05963b6144a8b22f8
2013-09-05 19:17:04 -07:00
Scott Main
4a9cc3864a remove prev/next links from API guides
Change-Id: Ic80ec436a6ee1c7decc3a6fc8905f52a1b50ea6a
2013-09-05 16:29:14 -07:00
Scott Main
0ad622b4a6 add ellipsis for overflowing strings in samples nav
Change-Id: I1efcba409b068be0616eb2e3d80fadda301fd5f6
2013-09-04 21:14:06 -07:00
Dirk Dougherty
6fb7e23bba Add file path above h1 in samplecode files.
Change-Id: I91adb197b478ea476bbf0e07650486581c1ca8ec
2013-08-30 19:06:57 -07:00
Dirk Dougherty
981effcc96 Add breadcrumb for sample code html pages.
Change-Id: Iaec2e2686ce2fba4169f0d2ee80c122c6ae55bee
2013-08-26 11:36:00 -07:00
Scott Main
d4645ea9d4 remove project structure from sample landing pages
Change-Id: I646aa996ce518421567c09bbb3a0cd8b4875d530
2013-08-22 16:29:20 -07:00
Scott Main
285f07722d Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs 2013-08-22 23:22:09 +00:00
Scott Main
dc63ddaabb clean up the sample template files to remove unused stuff
and fix the collapsible project list
and highlight the Samples nav

Change-Id: I8baf5874ae709c914aae47ffb04fc8e0b84e8dea
2013-08-22 16:09:59 -07:00
Scott Main
f009385738 fix a couple bugs in sidenav for samples.
Previously, clicking a link still invoked the expand collapse behavior.
Previously, collapsing a parent item did not also collapse its children.

Change-Id: Iac0b9208bfbab79e9715850f9a192c22250d0673
2013-08-22 11:37:11 -07:00
Scott Main
498d710a4f modify sample template and add new css/script for new numbered code.
The line numbers are included inside the <pre> block initially, but
hidden, so this script moves the numbers to a separate block on
the left and makes them non-selectable. Also includes script for
features like single-click to highlight a line of code and double-click
to invoke the link for that line.

Change-Id: I17ebb1255ff036948028b4722cc8e9758fb96553
2013-08-21 16:12:26 -07:00
Scott Main
ad08f07cf2 new version of script to build sidenav lists dynamically.
This is currently used only by the samples nav, but we'll
later update to handle the Google reference nav as well

Change-Id: I907ea8cb096148ba50808623ed872c8defc9a135
2013-08-20 17:01:42 -07:00
Dirk Dougherty
f5ffd4a40c Clean up core css changes brought in with samples css.
Change-Id: I0920695be4f6ed7085508a4451c13bc7d9e65d9a
2013-08-19 12:26:07 -07:00
Dirk Dougherty
4f7e515940 doc change: Samples browsing: basic support in templates and js/css.
Change-Id: Ie2323f5323c624420c90c8c782b840f183238f7c
2013-08-19 11:28:59 -07:00
Scott Main
52dd206715 fix two bugs in site script.
1. Fix URL path check for reference docs to initalize api level and sidenav.
Previously, this condition was never true, so the sidenav would not be initialized
under default conditions and the reference drag bar would not appear.
2. Fix the recent change to the 'scroll into view' script so that it works
properly in a multi-pane sidenav (reference docs) by again making the offset
measurement relative to the parent container (but much better than was done before).

Change-Id: I2a31ed59d772346651c2432f0ed26530983c49ff
2013-08-15 12:22:28 -07:00
Scott Main
3b90aff04c add fixed size to training icons (and remove whitespaces)
Change-Id: Iad8b597b9f181833d9f1d63e128abb49486fa543
2013-08-01 18:21:31 -07:00
Scott Main
c774a31235 Merge "fix sidebar autoscroll when the selected doc is not visible. bug: 9676913" into jb-mr2-docs 2013-07-31 01:14:34 +00:00
Scott Main
bc72957e92 fix sidebar autoscroll when the selected doc is not visible.
bug: 9676913

This was not working for third generation list items. Switching
the position measurement to be relative to the entire page rather than
the parent container fixes it. I then added 125px to account for
the site header and set the threshold and placement of scrolled items
to be at 80% the nav height.

Change-Id: Idda1896d11069e56325ba830ed745dae9e0fc483
2013-07-30 18:00:51 -07:00
Scott Main
5eccda8d6b add 'wide' version of design/develop cross-link buttons.
Primarily for training pages, which have a wider TOC box

Change-Id: I29644596e72e43432f7bd00fd6a5aabf7e3a6bb7
2013-07-30 14:56:45 -07:00
Joe Fernandez
3c1da3e2c9 DO NOT MERGE
cherrypick from jb-mr2-ub-dev
docs: small fix for NDK download table

Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c
2013-07-25 18:21:00 -07:00
Dirk Dougherty
48e3f1d6e4 Add new table rows for legacy ndk downloads.
Change-Id: If8ebc459415a22719d351d87a55ddeb4ddb6b3ba
2013-07-25 15:54:26 -07:00
Scott Main
5430d20dda fix the api level filter (wasn't greying out APIs on page load)
Change-Id: Iaafe8c0652856eaff6725491f21581969e94f430
2013-07-23 20:48:54 -07:00
Scott Main
701a07fd33 remove margin changes for paragraphs in collapse container
Change-Id: I5ee51699cb473334e1c3cfb520c8145466eea265
2013-07-23 12:41:25 -07:00
Scott Main
98a2a71f9e edit code-caption style margin
Change-Id: I63c58015ca9037621c5d4c3929620ebd2203f5ad
2013-07-17 13:15:04 -07:00
Scott Main
e80ddbe976 fix design/develop boxes float
Change-Id: Id6de3e74667f5cc485290509919e0f5cce689505
2013-07-12 19:22:24 -07:00
Scott Main
27403b8036 add style to add nexus 4 frame to screenshots
Change-Id: I1e96cbd755c4c6f88c807160b9a86b77a5ebed74
2013-07-10 16:36:05 -07:00
Dirk Dougherty
8c01be686c am ccc15faf: am 56811475: am 5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit 'ccc15faf56ad46f973800cb6bd41b4634b9192a0':
  Doc change: Move butterbar css to template assets.
2013-07-08 17:33:58 -07:00
Dirk Dougherty
5386532e03 Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev 2013-07-09 00:28:40 +00:00
Dirk Dougherty
4c2dfcfd6d Doc change: Move butterbar css to template assets.
Change-Id: Ifa116fe304150c7c663b8088e00349ffdc69017c
2013-07-08 16:05:05 -07:00
Scott Main
7672ccb3d7 am fb2bb3d8: am 51852a3f: am 8c0f5b3a: enable download box style for qv sidebox
* commit 'fb2bb3d867fcdd3add7e30d1cbb6b956d3fce89e':
  enable download box style for qv sidebox
2013-07-08 15:28:53 -07:00
Scott Main
8c0f5b3aef enable download box style for qv sidebox
Change-Id: I209e9971d886e45498aab0b4d43241ded5285f24
2013-07-08 15:12:02 -07:00
Scott Main
cef39240fb align sidebox with content body
Change-Id: Id6cd8cdd1b21b8ceda2a6931bb69f096c0d6deb1
2013-06-19 20:29:47 -07:00
Scott Main
d19c2c82c1 update design/develop link icons to 2x for high res display
Change-Id: I09560c395088e0f8d835199a6eb4267af50bddaa
2013-06-19 18:48:27 -07:00
Scott Main
aaf7664d88 add style for links to Design docs from developer docs
Change-Id: I0f7e561c98277fb1b6b9c0b95a2ed7eef890c6db
2013-06-19 18:39:16 -07:00
Scott Main
d7026f7a5f add new script to toggle visibility of nested list items.
call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle

Change-Id: I6f1ee74b957f88c23550145c6ed057d8e7797c99
2013-06-17 15:09:57 -07:00
Dirk Dougherty
686f55a596 am 5b146f22: am e5862e8a: Doc change: css for distribute links.
* commit '5b146f227a3dfaa62b8e40f3a2b7a21991c09a4a':
  Doc change: css for distribute links.
2013-05-15 04:25:47 -07:00
Dirk Dougherty
e5862e8a1e Doc change: css for distribute links.
Change-Id: Ifc74ea3f6099484b9c7549f8e8684dda4aeaf96f
2013-05-15 02:20:53 -07:00
Scott Main
382b121c0c am 3d2121f0: am 0b2db169: add \'go-link\' style for "next" style arrows w/o the javascript effects
* commit '3d2121f0c951c6e6b621bd892da5836f005f00e1':
  add 'go-link' style for "next" style arrows w/o the javascript effects
2013-05-15 01:25:00 -07:00
Scott Main
0b2db169cb add 'go-link' style for "next" style arrows w/o the javascript effects
Change-Id: I2950579b2657bdacfe038790668959d607a60277
2013-05-15 01:15:50 -07:00
Scott Main
9bfcd733cf adjustments to developer notice style
Change-Id: Id5ffd85524afc79c005dc3884e442e777fe54b5f
2013-05-14 09:33:19 -07:00
Scott Main
d2af6d2284 add styles for crosslink from design to develop docs
Change-Id: Ia6ad4f03cec5a26fd9b7585be05f46efa2eeca7e
2013-05-13 18:47:03 -07:00
Dirk Dougherty
0b026ce6eb Update cs file to use devsite-compatible lowercase lang ids.
Change-Id: Ie20e5977464199648fd91515ebe71c250162c0ee
2013-05-04 13:13:21 -07:00
Scott Main
0e76e7e4dd provide search suggestions for api guides, training, etc.
also:
 - demote deprecated APIs in suggestions
 - focus search bar with / and exit search with ESC

Change-Id: I78818d76375d63b9eb42922d6c20ebbea30c353b
2013-05-02 10:38:45 -07:00
Scott Main
8aa725e694 re-add styles for xml definition lists.
used in manifest reference pages and was lost during switch to DAC2

Change-Id: I0fcaebc37fe1665bfced4b109945c9dbf6389818
2013-04-25 11:12:51 -07:00
Dirk Dougherty
a32f1bb4e4 am 547d9e93: Doc change: css for checklist more resources blocks.
* commit '547d9e93b21e62f1153aaac49c22b1f648b4fef5':
  Doc change: css for checklist more resources blocks.
2013-04-15 20:30:00 -07:00
Dirk Dougherty
547d9e93b2 Doc change: css for checklist more resources blocks.
Change-Id: If0678b08d135f708bf6ecee49831ef233a862389
2013-04-15 18:45:42 -07:00
Dirk Dougherty
48732d9aaa am bec14294: Doc change: css for policy docs.
* commit 'bec142949a33bf7d195d022e9ec99a1a84197065':
  Doc change: css for policy docs.
2013-04-15 15:34:05 -07:00
Dirk Dougherty
bec142949a Doc change: css for policy docs.
Change-Id: I5d8609d7e20315e5bb022f057704b2814ad9e172
2013-04-11 21:48:54 -07:00
Robert Ly
3eba74ffc1 am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev
* commit 'ddde20b67c521fbd7ad090f7a1e4ab3f69865b4f':
  fix android build number in footer of gms and gcm reference
2013-04-03 13:48:35 -07:00
Robert Ly
ddde20b67c Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 2013-04-03 20:38:55 +00:00
Scott Main
f614554dae load google API navtree ondemand (remove request from <head>).
Also move the code for highlighting the sidenav into a separate method
that we can call at a later time, such as after the gms reference is loaded into nav.

Change-Id: I924d68b2b9dbfed83f81d1fd418e06b6c79a9010
2013-04-01 16:38:11 -07:00
Scott Main
25e7300c24 load the navtree javascript on demand; don't try setting up the tree until it's loaded
Change-Id: I1f209869a17099dd853a2f4cae766481a6cd03eb
2013-03-27 15:49:14 -07:00
Scott Main
de29527684 add javascript action events to search suggestions and search results.
Allows us to track and compare the success of suggested results and results from Google

Change-Id: I64750e3b96ea585de415969cad8ab46c3bbbcaf4
2013-03-25 15:54:05 -07:00
Scott Main
01a2545bba docs: update templates to remove global content for devsite builds
Change-Id: I8c8d052248cebe6408d8c18b44baadd03f3bc96c
2013-03-21 18:12:51 -07:00
Scott Main
ec93c11194 Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs 2013-03-20 22:16:27 +00:00
Scott Main
a2303454fd add 64-bit variety NDK packages to download table.
Use same naming convention as SDK packages for consistency.

Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c
2013-03-20 15:01:35 -07:00
Scott Main
24790db1cd fix indentation style for nested lists
Change-Id: Id4e1aa6f4dacf0984cfc891081799be887543453
2013-03-19 14:38:59 -07:00
Scott Main
2d967c6df6 tweak jspane width property to ensure bg color for highlighted item is full width
Change-Id: I92e66493229476c29cf71c74091f36063638def4
2013-03-11 09:21:07 -07:00
Scott Main
a07be8eee4 switch code font to pure monospace (sans serif).
also add proper margins for elements nested in lists

Change-Id: I1c2914904da63d21359283de945c9805f5d4af93
2013-03-06 12:12:21 -08:00
Scott Main
f8333457a5 Revert "docs: move loading of google ref into doc load event to prevent error during load"
This reverts commit 578d6446eb.
2013-02-26 18:10:20 -08:00
Scott Main
578d6446eb docs: move loading of google ref into doc load event to prevent error during load
Change-Id: Ibe825c25e19f136b2cd58e8a096d13904720e3d2
2013-02-26 14:46:12 -08:00
Scott Main
9f2971d1f3 docs: fix suggestions due to file name change for js files
Change-Id: I4037c80f79f37f7a80d0977b4e07f992e3de61e1
2013-02-26 13:07:41 -08:00
Scott Main
7e447edffa docs: update search suggest with google services apis
including some optimizations for loading javascript resources

Change-Id: Idfea12bbb70a24a7853d997e8376e3db50e56760
2013-02-26 10:53:54 -08:00
Scott Main
d6cb8fac53 docs: fix padding for left-figure class
Change-Id: Ic4a1a95410f4d913a278bdb8a75c98ce5c4f5bfd
2013-02-21 13:05:03 -08:00
Scott Main
0e69c3e4e7 Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev 2013-02-21 18:53:25 +00:00
Scott Main
48dd7f22d9 docs: add image frame style and left-float figure box
Change-Id: I9103f6f9e9b416902fbb2add60782ba10ff9e900
2013-02-21 10:52:02 -08:00
Robert Ly
dae7b523aa Revert "support differently named lists.js files"
This reverts commit a6043f76fa

Change-Id: Id7212f9f1ffbe62fd26f97ab6dcea93bcb34e476
2013-02-21 02:07:00 +00:00
Robert Ly
54056be557 fix android build number in footer of gms and gcm reference
Change-Id: I4726ef6392d63c41d3f79947f78b8837e5d8933b
2013-02-20 16:07:32 -08:00
Robert Ly
a6043f76fa support differently named lists.js files
Change-Id: Id564c916e891051f73e4c7d7a3683d58a48ee16d
2013-02-20 14:47:44 -08:00
Scott Main
769a5d8698 docs: re-add dev-docs css because it's needed by diff reports
Change-Id: Ic3f334f5510b008cd1f744823e46fb4fdf5630bd
2013-02-13 11:39:09 -08:00
Scott Main
ac2aef5bd8 docs: switch templates to dynamic tab highlighting; prep for devsite template migration
Change-Id: I5785c63603d8da5dfa1118fe28a3106aa20835a6
2013-02-12 14:21:26 -08:00
Scott Main
3062cb889b Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev 2013-02-11 19:54:11 +00:00
Scott Main
d44c3772e0 docs: udpate JS bundle URL for dac devsite
Change-Id: I06d8b8536c55581b8e7b2d59c55b3d3069d7fe1d
2013-02-11 11:47:05 -08:00
Scott Main
b7f963758f docs: fix ::selection style to use Android blue for text highlighting
Change-Id: I485be948326fc40c349c8170dd1be13962b4c003
2013-02-07 16:56:43 -08:00
Scott Main
6668404ede Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev 2013-02-01 23:32:08 +00:00
Scott Main
c5480c32c2 docs: minimize code-font line-height.
Fixes problem in which any paragraph with code text has more whitespace below it than other lines.

Change-Id: I0f39655472d09f5af346c7c7e4df8eb0a5a144df
2013-02-01 15:29:44 -08:00
Scott Main
77c51357eb docs: fix lang switcher for gae by deleting obsolete method call
Change-Id: I8d91d18e89d539960c93748557cccc5aabb0a263
2013-01-30 15:03:59 -08:00
Scott Main
98f23e7af0 docs: delete obsolete asset files
Change-Id: I1aa8a8fa757dbc81180c0585eacb68df5fe0ceb1
2013-01-29 16:05:55 -08:00
Scott Main
e05e6f99b3 docs: update template files with those from the templates-ds directory
Change-Id: I47b07b17ea79d0b00300492ba7854e37f1ab00d0
2013-01-29 14:45:34 -08:00
Scott Main
015d616af8 docs: use devsite hdf bool as a javascript condition for managing the lang toggle.
sync the sdk and ds templates so we can move toward one template set

Change-Id: I5316d4cd085734a47953beba203ba8beeb64549e
2013-01-29 10:43:14 -08:00
Scott Main
eb41035fcf docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
2013-01-14 20:47:40 -08:00
Scott Main
869f3d1f68 Merge "docs: update analytics script to support event tracking" into jb-mr1-dev 2013-01-08 18:47:45 -08:00
Scott Main
ae3ee424e1 docs: update analytics script to support event tracking
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
2013-01-08 18:45:08 -08:00
Scott Main
b8d06a55e0 docs: don't allow setting the sidenav fixed if the doc body is
shorter than the sidenav. Scrolling won't be possible in this case
anyway, but this change fixes a glitch that happens on OSX Lion because
it will allow scrolling anyway for the overscroll bounce.

Change-Id: I1be1c170e327f3cdfe81076a473f74425b8bd080
2012-12-19 18:42:16 -08:00
Robert Ly
5c0f9e996a Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev 2012-12-03 12:58:15 -08:00
Robert Ly
f88a53d5c3 Merge "docs: support google css class for reference docs" into jb-mr1-dev 2012-12-03 12:57:50 -08:00
Robert Ly
67d75f16f4 fix docs.js bug where changeApiLevel is getting called
Change-Id: Ic250afc792d7e4174bd987ce31df384dad3831ca
2012-12-03 12:55:48 -08:00
Robert Ly
06884f596c docs: support google css class for reference docs
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
2012-12-03 11:50:38 -08:00
Scott Main
df08adae5b docs: add "Google Services" search tab
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
2012-12-03 08:54:37 -08:00
Scott Main
8fa5351cba show build info only for android docs (not google)
Change-Id: I318f4f68147c109c119ed1fc05c2429ecc7289b7
2012-11-30 20:19:37 -08:00
Dirk Dougherty
e0dceabdd8 Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev 2012-11-30 15:39:03 -08:00
Scott Main
ac71b2b59b docs: revisions for google reference nav
Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed
2012-11-30 14:58:24 -08:00
Robert Ly
8acd75aa04 add google class for body
Change-Id: Ie809df1d207ec08ae232f4ae194959eac69ec5fb
2012-11-30 14:02:43 -08:00
Dirk Dougherty
18dca5d058 Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
Change-Id: I384c5c5df053d9e98fa953c2e3998e7c99c08569
2012-11-30 12:44:40 -08:00
Scott Main
5747d38aad enforce margin change for nolist class in training articles
Change-Id: I7da486d557c3d7629827d2b425fd387366bd7f18
2012-11-30 12:02:42 -08:00
Scott Main
4e477d7b9c Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev 2012-11-30 11:32:42 -08:00
Scott Main
ab4daf4f58 docs/css: break words that are too long to fit sidenav; add style for google javadocs
Change-Id: I69f062c5e1ddeafdae75e8f2ec77226aac836e48
2012-11-30 11:27:17 -08:00