Commit Graph

1879 Commits

Author SHA1 Message Date
Scott Main c14c27af74 am a3362a7f: am d19a1ff4: am 3f4fcef5: am 25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit 'a3362a7f67b87e89f5d82cf62f51d6b36be008fc':
  enable auto-linking to next lesson with 'next-page-link' css class
2013-10-14 19:00:51 -07:00
Kenny Root 16d2dccd09 am b0af7e51: am cc68ce70: Merge "Allow ECDSA signing OTA files"
* commit 'b0af7e5107abb17fc756044454b3a452d0dafb50':
  Allow ECDSA signing OTA files
2013-10-14 14:13:44 -07:00
Kenny Root b0af7e5107 am cc68ce70: Merge "Allow ECDSA signing OTA files"
* commit 'cc68ce7012784a3d2ad12e041c8e82def74f20cd':
  Allow ECDSA signing OTA files
2013-10-14 14:10:05 -07:00
Scott Main a3362a7f67 am d19a1ff4: am 3f4fcef5: am 25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
* commit 'd19a1ff4b2c4a3c7d76ea94702776e8b2087d705':
  enable auto-linking to next lesson with 'next-page-link' css class
2013-10-14 13:17:46 -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
Kenny Root 01ed66d2ba Allow ECDSA signing OTA files
ECDSA works in the recovery verifier, so we can allow OTA updates to be
signed with EC keys.

Change-Id: If8f2be028843fbfd6c8c9c41b492605d9b5cbeb0
2013-10-09 15:00:24 -07:00
Kenny Root 2b983b2299 am c80b7cda: am 2acb1ea7: Merge "SignApk: add argument for loading a Provider"
* commit 'c80b7cdaebfaeae1b95ad49b5a2782f9e5ee8727':
  SignApk: add argument for loading a Provider
2013-09-25 14:41:54 -07:00
Kenny Root c80b7cdaeb am 2acb1ea7: Merge "SignApk: add argument for loading a Provider"
* commit '2acb1ea76d294f993993a0852c30dd93dc46c600':
  SignApk: add argument for loading a Provider
2013-09-25 14:39:48 -07:00
Kenny Root 9f99cffb4e am c4b84239: am 085d3b5f: Merge "Read algorithm OID directly from PKCS#8 container"
* commit 'c4b84239063082418f474707ac1dcc2270c8c698':
  Read algorithm OID directly from PKCS#8 container
2013-09-25 11:49:07 -07:00
Kenny Root c4b8423906 am 085d3b5f: Merge "Read algorithm OID directly from PKCS#8 container"
* commit '085d3b5fdbb1d02607ee107581c22c090082db65':
  Read algorithm OID directly from PKCS#8 container
2013-09-25 11:45:30 -07:00
Kenny Root 89c961aa11 SignApk: add argument for loading a Provider
For supporting loading a custom key type provider, add a -providerClass
argument that loads the selected JCE at the front of the provider list.

Change-Id: I3df16f7c570d36e08806b614d6f30c41cb117565
2013-09-25 11:37:52 -07:00
Kenny Root 62ea4a5c3c Read algorithm OID directly from PKCS#8 container
The PKCS#8 PrivateKeyInfo structure has the algorithm OID encoded right
before the actual key octet stream is encoded. Use Bouncycastle to read
the OID for creation with the key factory.

This aids in the creation of custom key types that are backed by
hardware devices (e.g., HSMs) and have their own assigned OIDs.

Change-Id: If5d8fe07bc157e9bb5a3fb5f99091e924143105f
2013-09-25 09:59:10 -07:00
Kenny Root 842117daf3 am 19ccb3a6: am abc0bf08: Merge "SignApk: add support for EC keys"
* commit '19ccb3a62a6024de0cfd984a97a85a51a45f028b':
  SignApk: add support for EC keys
2013-09-24 11:10:47 -07:00
Kenny Root 19ccb3a62a am abc0bf08: Merge "SignApk: add support for EC keys"
* commit 'abc0bf084beea3251c042b28576c8f398749c80b':
  SignApk: add support for EC keys
2013-09-24 11:07:58 -07:00
Kenny Root 3d2365c068 SignApk: add support for EC keys
Change-Id: I09bc0e52fc84ec321b997016a8f97de1bfd2770d
2013-09-20 15:00:49 -07:00
Kenny Root 84f12ed9d8 am 13722ac8: Merge "SignApk: update SignApk to support SHA256withRSA signing"
* commit '13722ac89f5512b932f13895217a6f861b77f57e':
  SignApk: update SignApk to support SHA256withRSA signing
2013-09-20 14:20:24 -07:00
Doug Zongker 8562fd478d SignApk: update SignApk to support SHA256withRSA signing
(cherry picked from commit c0581a02ed)

Change-Id: I6212e0f3a6aa3265b111f0f7348b667af4a668b0
2013-09-20 13:14:32 -07:00
Scott Main 118cb04f92 am 00a218a9: am 14e066d5: am 4ec62cee: am 40de3237: add support for custom <head> tags in each file with page.customHeadTag HDF var
* commit '00a218a9c818fd69b8f43b950109183d13f01296':
  add support for custom <head> tags in each file with page.customHeadTag HDF var
2013-09-20 10:09:33 -07:00
Scott Main 00a218a9c8 am 14e066d5: am 4ec62cee: am 40de3237: add support for custom <head> tags in each file with page.customHeadTag HDF var
* commit '14e066d5c8aedfad8b29b6784793f416af01e392':
  add support for custom <head> tags in each file with page.customHeadTag HDF var
2013-09-20 10:07:04 -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 5a6e47bffb am b7530442: am a18b429f: am fe340fac: am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
* commit 'b7530442594903a0a0a9bb0b9cb41edc8c0de72b':
  update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 18:03:33 -07:00
Scott Main b753044259 am a18b429f: am fe340fac: am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
* commit 'a18b429fd3792b7c3fad2e0682aa39990b332c98':
  update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 18:00:16 -07:00
Ying Wang 13871a8f50 resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp
Change-Id: Iad8793c5e53b239425e9bba1b6a925265ff8d130
2013-09-13 17:50:29 -07:00
Ying Wang 65d5e78865 am 4b7d8f11: Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS"
* commit '4b7d8f119a15a21445d6bc872b8e36e6f848e846':
  Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
2013-09-13 17:43:34 -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 cd2ced2375 am d9fa5580: am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit 'd9fa558056871433425746499d2bbf4e4d0fc92e':
  fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:19:47 -07:00
Scott Main d9fa558056 am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit '0c2b69d5b82062ecdef39297ddc7f7d86d038ad8':
  fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:17:38 -07:00
Nick Kralevich 46f00b6167 am b5d4c0df: Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
* commit 'b5d4c0df503966f2a050af64dfa15c84f2e12c15':
  Update OTA to understand SELinux labels and capabilities
2013-09-10 13:14:54 -07:00
Nick Kralevich 0eb17d9447 Update OTA to understand SELinux labels and capabilities
Update the OTA generation script to understand SELinux file
labels and file capabilities.

Make fs_config aware of SELinux labels and file capabilities, and
optionally output those elements whenever we output the
UID / GID / file perms. The information is emitted as a key=value pair
to allow for future extensibility.

Pass the SELinux file label and capabilities to the newly created
set_metadata() and set_metadata_recursive() calls. When the OTA
script fixes up filesystem permissions, it will also fix up the SELinux
labels and file capabilities.

If no SELinux label and capabilities are available for the file, use
the old set_perm and set_perm_recursive calls.

Bug: 8985290
Bug: 10183961
Bug: 10186213
Change-Id: I4fcfb2c234dbfb965cee9e62f060092a4274d22d
2013-09-10 12:30:43 -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 2c6124fd6f am 00fcdfed: am 0b345f58: am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
* commit '00fcdfede678c274675436d0008fc4a668ef711c':
  Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 13:38:27 -07:00
Dirk Dougherty 00fcdfede6 am 0b345f58: am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
* commit '0b345f589691a774d04a698e80412c531c726f6c':
  Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 11:51:52 -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 85b2d38124 am 9a13b7a4: am 76ff86cd: am 5d9690e3: am 4a9cc386: remove prev/next links from API guides
* commit '9a13b7a416141c46ed032ef72990141925cc8aa3':
  remove prev/next links from API guides
2013-09-05 17:09:50 -07:00
Scott Main 9a13b7a416 am 76ff86cd: am 5d9690e3: am 4a9cc386: remove prev/next links from API guides
* commit '76ff86cd32927899cd6a2913d4eeb920806d0ae6':
  remove prev/next links from API guides
2013-09-05 17:06:52 -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 9e44e9f666 am 9cf09123: am 07540873: am eb23299b: am 0ad622b4: add ellipsis for overflowing strings in samples nav
* commit '9cf0912352163fb0c9a08221b44be23eccdffc15':
  add ellipsis for overflowing strings in samples nav
2013-09-04 21:22:56 -07:00
Scott Main 9cf0912352 am 07540873: am eb23299b: am 0ad622b4: add ellipsis for overflowing strings in samples nav
* commit '07540873614ac13d1352ab30e25ea8f1aabc4035':
  add ellipsis for overflowing strings in samples nav
2013-09-04 21:21:30 -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 e8e90c3d58 am 49f58bb7: am 70892395: am d55fb681: am 6fb7e23b: Add file path above h1 in samplecode files.
* commit '49f58bb74ed7cb7038adbd98904c1bf594c45fc3':
  Add file path above h1 in samplecode files.
2013-09-03 15:26:51 -07:00
Dirk Dougherty 49f58bb74e am 70892395: am d55fb681: am 6fb7e23b: Add file path above h1 in samplecode files.
* commit '70892395bb48ffca762a47c9bb35c1ad9c3512dc':
  Add file path above h1 in samplecode files.
2013-09-03 15:25:08 -07:00
Dirk Dougherty 6fb7e23bba Add file path above h1 in samplecode files.
Change-Id: I91adb197b478ea476bbf0e07650486581c1ca8ec
2013-08-30 19:06:57 -07:00
Clay Murphy 6c6be899e0 am 5711d73e: Merge "Docs: Fixing link from logo in PDK Bug: 9177537 Staging location: http://claym.mtv.corp.google.com:8083/guide/getting_started.html" into klp-dev
* commit '5711d73ed04e1c8d3c877565796a632c14a2b5fb':
  Docs: Fixing link from logo in PDK Bug: 9177537 Staging location: http://claym.mtv.corp.google.com:8083/guide/getting_started.html
2013-08-28 08:59:19 -07:00
Clay Murphy 87aa83befb Docs: Fixing link from logo in PDK
Bug: 9177537
Staging location:
http://claym.mtv.corp.google.com:8083/guide/getting_started.html

Change-Id: I4c4708a168688fdfc79468b955115d7f37df1bc2
2013-08-27 16:04:35 -07:00
Jianxun Zhang 098494981d Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
The existing logic in common.py breaks string arguments incorrectly:
e.g. --para1 val1 --para2 "val2 is a string" will be output as:

'--para', 'val1, '--para2', 'val2' 'is' 'a' 'string'

This will cause mkbootimg command fails due to the invalid arguments
generated from the wrong parsing.

The patch fixes this issue to get:

'--para', 'val1, '--para2', 'val2 is a string'

Change-Id: Ia34ec357550f11ae9d6adc719d86a0c6a9099fbc
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
2013-08-27 15:31:13 -07:00
Dirk Dougherty fa35b2b3fb am 5d2a0a0b: am 13ab927a: am 2747bec3: am 981effcc: Add breadcrumb for sample code html pages.
* commit '5d2a0a0ba7df0338e6dc1a4ee359abc69478553e':
  Add breadcrumb for sample code html pages.
2013-08-26 15:04:29 -07:00
Dirk Dougherty 5d2a0a0ba7 am 13ab927a: am 2747bec3: am 981effcc: Add breadcrumb for sample code html pages.
* commit '13ab927a81256c8cb03bcbd31344ae979ab78617':
  Add breadcrumb for sample code html pages.
2013-08-26 11:56:37 -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 c4abb72d68 am bdee9fbe: am 504dbfc3: am fc8140d3: am d4645ea9: remove project structure from sample landing pages
* commit 'bdee9fbe939d13e76cb45aabbcc85a22551ae297':
  remove project structure from sample landing pages
2013-08-22 16:42:50 -07:00
Scott Main bdee9fbe93 am 504dbfc3: am fc8140d3: am d4645ea9: remove project structure from sample landing pages
* commit '504dbfc3b984e3e7981acba8f0b6e65348838bcd':
  remove project structure from sample landing pages
2013-08-22 16:39:35 -07:00
Scott Main 59516a5f5b am 1ebd160a: am c120c3fe: am 1ef0d363: am 285f0772: 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
* commit '1ebd160a823668d42a3f8216370035da2b8e7d36':
  clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav
2013-08-22 16:34:00 -07:00
Scott Main b11ea03ff8 am ac2fbe85: am f1d5a3b1: am 2b9846d9: am f0093857: 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.
* commit 'ac2fbe8507f7295681a528e6858a0fb6676f7324':
  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.
2013-08-22 16:34:00 -07:00
Scott Main 1ebd160a82 am c120c3fe: am 1ef0d363: am 285f0772: 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
* commit 'c120c3fecb193835d56beec245913111f2fc8e41':
  clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav
2013-08-22 16:32:12 -07:00
Scott Main ac2fbe8507 am f1d5a3b1: am 2b9846d9: am f0093857: 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.
* commit 'f1d5a3b117ca827c26d901875ac69e2fde0fb106':
  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.
2013-08-22 16:32:12 -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 1a3abca0d8 am 40371463: am fa704681: am a320b99a: am 498d710a: 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 ma
* commit '40371463865331f3d7604891bb70c0a37dbf36ae':
  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.
2013-08-21 19:18:48 -07:00
Scott Main 4037146386 am fa704681: am a320b99a: am 498d710a: 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-
* commit 'fa704681f9109eb25e19ab4eeb53636e92501c55':
  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.
2013-08-21 17:44:52 -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 69edd19acc am 0dcef01e: am feb45280: am 8088dd2f: am ad08f07c: 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
* commit '0dcef01e1e08ca61754cbfd8ebe8d13696beb31e':
  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
2013-08-20 17:32:44 -07:00
Scott Main 0dcef01e1e am feb45280: am 8088dd2f: am ad08f07c: 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
* commit 'feb45280aa67e4fd7280d15caae3673b82895624':
  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
2013-08-20 17:28:14 -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 3fb9cec4f5 am b9fe2d2c: am 337ebc19: am 62c755a5: am f5ffd4a4: Clean up core css changes brought in with samples css.
* commit 'b9fe2d2c93ae9734d174f07427ebb3d17b7b346c':
  Clean up core css changes brought in with samples css.
2013-08-19 15:06:09 -07:00
Dirk Dougherty b9fe2d2c93 am 337ebc19: am 62c755a5: am f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '337ebc195ff7ebb4f12b9012ccfc9f89a8a66570':
  Clean up core css changes brought in with samples css.
2013-08-19 15:02:50 -07:00
Ying Wang a3ee330ac5 am fa67740a: am 25977365: Merge "mkbootimg: Support custom mkbootimg implementation"
* commit 'fa67740ae41fc068d9a9b5fbf5a7a06c36dbbdb1':
  mkbootimg: Support custom mkbootimg implementation
2013-08-19 14:29:32 -07:00
Ying Wang fa67740ae4 am 25977365: Merge "mkbootimg: Support custom mkbootimg implementation"
* commit '259773656ac0c0c4ef588c949aaf21216c44b339':
  mkbootimg: Support custom mkbootimg implementation
2013-08-19 14:26:35 -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 03fb7473c4 am 2d028379: am 6d244fb2: am d5ac8330: am 4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '2d0283792d1fd2fcb4f1dcdc4b34e40515f7393c':
  doc change: Samples browsing: basic support in templates and js/css.
2013-08-19 12:19:15 -07:00
Dirk Dougherty 2d0283792d am 6d244fb2: am d5ac8330: am 4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '6d244fb2ed0abdf843c33fca3a2ba2557ac921aa':
  doc change: Samples browsing: basic support in templates and js/css.
2013-08-19 12:14:19 -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 b8edbc0f7e am 6f03bd60: am ce478d54: am 7e453280: am 52dd2067: 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 an
* commit '6f03bd6092cba47d073e8bdc131d1cba89fa6c7c':
  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).
2013-08-15 14:57:11 -07:00
Scott Main 6f03bd6092 am ce478d54: am 7e453280: am 52dd2067: 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 referen
* commit 'ce478d54ad619c11b796b6286357c3203544d90d':
  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).
2013-08-15 14:51:37 -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
Bjorn Andersson 612e2cd0e8 mkbootimg: Support custom mkbootimg implementation
Support using custom mkbootimg to allow boards to specify custom
boot image formats. Also export this as the environment variable
MKBOOTIMG to the *_from_target_files releasetools scripts.

Change-Id: I2084273b1175de097fb7da5c4f2264ea8014d74f
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
2013-08-09 16:29:02 -07:00
Ying Wang 412bc2329f am 0a7e26e2: am a3f69c93: Merge "Modify release tools to replace certs in MMAC files."
* commit '0a7e26e29dfb5efbb008ced7509931e5e5eb4d71':
  Modify release tools to replace certs in MMAC files.
2013-08-09 12:47:17 -07:00
Ying Wang 0a7e26e29d am a3f69c93: Merge "Modify release tools to replace certs in MMAC files."
* commit 'a3f69c933430e5117b5e37e786487abd3a3488ce':
  Modify release tools to replace certs in MMAC files.
2013-08-09 12:45:01 -07:00
Robert Craig 817c574d75 Modify release tools to replace certs in MMAC files.
Added support to perform a string replace of specified
dev keys with release keys when using the release tool
scripts.

Change-Id: Id0e945b0d62720c41f5ca9764a00de4bcdecaab4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-08-09 07:20:52 -04:00
Ying Wang 07c07062df Let apicheck visible to unbundled build.
Change-Id: I22cd1e67aeb6bf23229016215ee0a15f5116513f
(cherry picked from commit 48d132659ebf99cf41d9fbf62ab1f09604938ca7)
2013-08-02 21:35:15 +00:00
Scott Main ad0f14f4ef am 76451706: am bb385125: am 3b90aff0: add fixed size to training icons (and remove whitespaces)
* commit '76451706d86daaf38889254f56e47ba989619b9c':
  add fixed size to training icons (and remove whitespaces)
2013-08-01 18:37:40 -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 3c70a5caf9 am bc36e229: am d1d606b4: am c774a312: Merge "fix sidebar autoscroll when the selected doc is not visible. bug: 9676913" into jb-mr2-docs
* commit 'bc36e22992e11e9a3856f1c78bb73ee44a748e92':
  fix sidebar autoscroll when the selected doc is not visible. bug: 9676913
2013-07-30 20:18:41 -07:00
Scott Main e0d430d409 am 65c92265: am 14066e74: am 5eccda8d: add \'wide\' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
* commit '65c922653bbdd779bc250befe5c78b1b78f8577c':
  add 'wide' version of design/develop cross-link buttons. Primarily for training pages, which have a wider TOC box
2013-07-30 20:18:40 -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
Joe Fernandez 1c1eebcbd5 am cb4a1e67: am 8d936902: docs: small fix for NDK download table
* commit 'cb4a1e673eafc52c496dfed294c5431c80c52688':
  docs: small fix for NDK download table
2013-07-25 17:23:04 -07:00
Joe Fernandez 8d93690239 docs: small fix for NDK download table
Change-Id: Ib014e0310960cf10566a6d04aee2acb81346a20c
2013-07-25 17:05:06 -07:00
Dirk Dougherty 45924686eb am 8574e7d9: am 48e3f1d6: Add new table rows for legacy ndk downloads.
* commit '8574e7d93e28069983da51ef40fa47bdc2e51daa':
  Add new table rows for legacy ndk downloads.
2013-07-25 17:04:24 -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 c5955bb1ef am 1a980beb: am 5430d20d: fix the api level filter (wasn\'t greying out APIs on page load)
* commit '1a980bebd48940688ae078e29f46b174a8c92e99':
  fix the api level filter (wasn't greying out APIs on page load)
2013-07-24 16:27:48 -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 0c1cd6865b am d039c5e2: am 701a07fd: remove margin changes for paragraphs in collapse container
* commit 'd039c5e27bdec1898709cb715e4410c885b218d3':
  remove margin changes for paragraphs in collapse container
2013-07-23 12:51:29 -07:00
Scott Main 701a07fd33 remove margin changes for paragraphs in collapse container
Change-Id: I5ee51699cb473334e1c3cfb520c8145466eea265
2013-07-23 12:41:25 -07:00
Doug Zongker 1f790c9733 Merge "distinguish signed and unsigned user builds in UI" 2013-07-23 19:10:05 +00:00
Doug Zongker a8608a7f7c distinguish signed and unsigned user builds in UI
Add "dev-keys" or "test-keys" to the value of ro.build.display.id for
user builds.  (This is the property that is displayed under "Build
number" in the Settings UI.)  Modify the signing script to remove the
keys tag from this value when signing.

Change-Id: I3d9d92056f8567d7f84b1be047619be7c6e4c419
2013-07-23 11:51:04 -07:00
Michael Runge 065ab7f0df Merge "Revert "Update OTA to understand SELinux filesystem labels"" 2013-07-22 21:57:00 +00:00