Commit graph

14378 commits

Author SHA1 Message Date
Dirk Dougherty
e21bed28ac Merge changes from templates-sdk to templates-sdk-dyn.
Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
2014-05-02 15:44:20 -07:00
Scott Main
613b251b7b Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs 2014-04-15 02:38:35 +00:00
Scott Main
4868e9bf92 remove the animated scroll adjustment for sticky nav.
Instead adjust the scroll position based on changes to the hashtag.

Change-Id: I34a6b386fa2104f8f2ac04e1d9820199f0ef0e94
2014-04-14 19:00:12 -07:00
Scott Main
1670cca5f9 Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs 2014-04-14 14:52:32 +00:00
Dirk Dougherty
318fb97168 Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
Change-Id: Ib140e7025360d60e6fb49e1e6c45e2c7ccc72cda
2014-04-13 19:57:44 -07:00
Scott Main
d6a8e662cf make the sticky bar aware of search result visiblity.
Fixes a bug that caused the sidenav to overlap search results.

Change-Id: I3dc431f46cd96164dd79f3d0461f5034cc912099
2014-04-12 16:40:48 -07:00
Scott Main
20cf2a91f0 update sticky nav to sync with sidenav
and build the breadcrumbs dynamically

Change-Id: Ib008d4606a8e82c468be75c051a8a9e623dc7c22
2014-04-10 20:13:54 -07:00
Dirk Dougherty
46b443acbd Adjust opacity for non-hover states and a few others.
Change-Id: I8a6dee3e25bc8e6c3f1ca19d4e68037df5ce9b91
2014-04-07 11:55:27 -07:00
Dirk Dougherty
08032409b4 Add basic support for rendering dynamic content on pages.
Change-Id: If3ba4f71771a01043ec6d544e3b4a9222ba35daf
2014-04-02 12:48:41 -07: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
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
Xavier Ducrohet
cc85124393 Merge "Add annotation support lib." into klp-ub-dev 2014-03-26 18:06:40 +00:00
Xavier Ducrohet
ef04682fdf Add annotation support lib.
Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974
2014-03-26 10:50:38 -07: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
Ying Wang
266cf4f259 am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit 'f39752e99b4e5083f1e91c46722f87def8143b49':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-24 21:21:26 +00:00
Ying Wang
f39752e99b Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
2014-03-20 17:28:57 -07: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
Dianne Hackborn
264d4001e7 am 7503e736: 4.4.3 is MR2, version boogaloo!
* commit '7503e736ebb0161a23ff0ee39a307cd436ea8afc':
  4.4.3 is MR2, version boogaloo!
2014-03-11 23:22:38 +00:00
Dianne Hackborn
7503e736eb 4.4.3 is MR2, version boogaloo!
Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
2014-03-11 14:54:09 -07:00
Dirk Dougherty
5c92d96607 am 541b4941: New temporary templates set for dynamic content support.
* commit '541b494103857da31505ba745b0da5bdbe0499b9':
  New temporary templates set for dynamic content support.
2014-02-15 18:12:08 +00:00
Dirk Dougherty
541b494103 New temporary templates set for dynamic content support.
Change-Id: I066e43cdebaf66c0d8b5e3622a286dc2c88c47b5
2014-02-14 18:31:53 -08: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
Mihail Dumitrescu
4df82b3e30 Allow proguarding the main app and the test app in a single run.
Bug: 12895101
Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
2014-02-07 19:11:24 +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
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
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
Michael Runge
6b55f00762 am facd992e: Makefile used spaces instead of a tab
* commit 'facd992ec73de763cfbca32dd6aa38ff76a07613':
  Makefile used spaces instead of a tab
2013-12-20 12:36:49 -08:00
Michael Runge
facd992ec7 Makefile used spaces instead of a tab
Change-Id: Ia34f80d99062ef2899527f11d7bf72e78c63e31c
2013-12-20 11:50:16 -08:00
Michael Runge
a80542dbf4 am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit '4038aa8fff8c68733bff8b55d8c8d1b59713ca37':
  Enabled incrementals to patch + rename moved files
2013-12-20 11:35:07 -08:00
David Friedman
fc2f434376 am 612a88b7: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '612a88b7faf5016138f6fbf70f1e89c993b0d2ab':
  Added a row for the "All platforms" download line (rebuild stl with debug info package)
2013-12-19 21:51:18 +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
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
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
Michael Runge
4038aa8fff Enabled incrementals to patch + rename moved files
Change-Id: I551fc5291847e3ace15361c203d86f566c26da97
2013-12-16 11:29:51 -08: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
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