Commit Graph

2728 Commits

Author SHA1 Message Date
Clay Murphy
fbdac37416 Docs: Making source.android.com headers match those of developer.android.com
Bug: 17814801
Change-Id: I128a76b32b0d92118f621062c62d72460313f4d6
2014-10-03 14:58:50 -07:00
smain@google.com
0ecfde0dfd am 0aa165d8: am c464dbc3: am 5e5f5b77: am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, wh
* commit '0aa165d84adabd4555ceb3511cd3a4ab589983dc':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
2014-10-03 21:42:45 +00:00
smain@google.com
0aa165d84a am c464dbc3: am 5e5f5b77: am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a>
* commit 'c464dbc3b673010720e66d6a299dadb1dfaadab6':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
2014-10-03 21:32:19 +00:00
smain@google.com
497e716dd7 am c464dbc3: am 5e5f5b77: am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a>
* commit 'c464dbc3b673010720e66d6a299dadb1dfaadab6':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
2014-10-03 19:21:41 +00:00
smain@google.com
c464dbc3b6 am 5e5f5b77: am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as ancho
* commit '5e5f5b777414204cf600727662ac0f89de6f8211':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
2014-10-03 19:03:43 +00:00
smain@google.com
5e5f5b7774 am 7ddf7943: am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all AP
* commit '7ddf794392d6e79fed66039fd9a59d37d12dbcd3':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
2014-10-03 18:59:17 +00:00
smain@google.com
7ddf794392 am 9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bu
* commit '9a818f55f4a4ca4f88c2a29f8e77ea6cb2153de6':
  more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug: 16924057
2014-10-03 18:54:36 +00:00
smain@google.com
9a818f55f4 more fixes to scroll offset for the sticky header.
This offsets the layout position of all <a name=""> tags so they naturally
show up below the sticky nav bar... though this is only for API reference,
which uses <a> tags as anchors for all API members.
bug: 16924057

Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c
2014-10-03 18:34:20 +00:00
Dirk Dougherty
174fa60766 am f30eef8f: am fa5fb510: am 6f1efb31: am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit 'f30eef8f554a3241298a686c5e59e618dbc8e177':
  Doc change: increment queryparam to trigger cache flush on proxies.
2014-09-27 06:17:31 +00:00
Dirk Dougherty
f30eef8f55 am fa5fb510: am 6f1efb31: am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit 'fa5fb51030043b286e2c14afe9fc024e3b3a09eb':
  Doc change: increment queryparam to trigger cache flush on proxies.
2014-09-27 06:04:51 +00:00
Dirk Dougherty
c55180c8a8 am fa5fb510: am 6f1efb31: am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit 'fa5fb51030043b286e2c14afe9fc024e3b3a09eb':
  Doc change: increment queryparam to trigger cache flush on proxies.
2014-09-27 05:30:28 +00:00
Dirk Dougherty
fa5fb51030 am 6f1efb31: am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '6f1efb310be5f66f05a0ac40f4af92d4770a7598':
  Doc change: increment queryparam to trigger cache flush on proxies.
2014-09-27 05:25:08 +00:00
Dirk Dougherty
6f1efb310b am 11451e2e: am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '11451e2ec160b0405528b2ba6c13b40b15df8ed1':
  Doc change: increment queryparam to trigger cache flush on proxies.
2014-09-27 05:20:41 +00:00
Dirk Dougherty
11451e2ec1 am 83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '83fadade5bbc43914059405c1e49dd112e66d28d':
  Doc change: increment queryparam to trigger cache flush on proxies.
2014-09-27 05:14:16 +00:00
Dirk Dougherty
83fadade5b Doc change: increment queryparam to trigger cache flush on proxies.
Change-Id: I0ffbcc48761e697340e0c4a721893b33a085a137
2014-09-26 15:00:55 -07:00
Doug Zongker
14c065bbb2 am e985f6f4: fix transfer list for full OTAs
* commit 'e985f6f4d84e12ac3e189156f1260e008ef990d0':
  fix transfer list for full OTAs
2014-09-26 14:54:00 +00:00
Doug Zongker
ead20e6a9a am 846cb3a9: add unit tests for rangelib
* commit '846cb3a9e628cb00088bf65a153c0fedc10f2621':
  add unit tests for rangelib
2014-09-26 14:53:59 +00:00
Doug Zongker
95dfa81664 am 62338188: generate version 2 blockimgdiff files
* commit '623381880a32a2912f95949a6c406038ac4e7064':
  generate version 2 blockimgdiff files
2014-09-26 14:53:58 +00:00
Jeff Arneson
46b670c788 am 151c7277: Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev
* commit '151c727736bfea2336383ee82414702fdd80a0b6':
  Refactor show_annotations_list to remove HTML tags from method params
2014-09-26 00:22:32 +00:00
Doug Zongker
e985f6f4d8 fix transfer list for full OTAs
The erase command we insert at the top for full OTAs was getting
inserted in the wrong place for version 2.

Change-Id: I9caf03a40efbdba79f3428f73e50d4319d9ba371
2014-09-25 16:39:45 -07:00
Doug Zongker
846cb3a9e6 add unit tests for rangelib
Change-Id: I3b77e849007259e697da56bd493ae5b553b901d1
2014-09-25 16:39:32 -07:00
Doug Zongker
623381880a generate version 2 blockimgdiff files
Generate version 2 of the block_image_update transfer list format.
This improves patch size by a different strategy for dealing with
out-of-order transfers.  If transfer A must be done before transfer B
due to B overwriting A's source but we want to do B before A, we
resolve the conflict by:

  - before B is executed, we save ("stash") the overlapping region (ie
    the blocks B will overwrite that A wants to read)

  - when A is executed, it will read those parts of source data from
    the stash rather than from the image.

This reverses the ordering constraint; with these additions now B
*must* go before A.  The implementation of the stash is left up to the
code that executes the transfer list to apply the patch; it could hold
stashed data in RAM or on a scratch disk such as /cache, if available.

The code retains the ability to build a version 1 block image patch;
it's needed for processing older target-files.

Change-Id: Ia9aa0bd45d5dc3ef7c5835e483b1b2ead10135fe
2014-09-25 16:39:14 -07:00
Jeff Arneson
5925fd13e8 am 151c7277: Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev
* commit '151c727736bfea2336383ee82414702fdd80a0b6':
  Refactor show_annotations_list to remove HTML tags from method params
2014-09-25 03:56:53 +00:00
Jeff Arneson
151c727736 Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev 2014-09-25 03:45:50 +00:00
Michael Runge
a660afc33d am 7914651f: Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev
* commit '7914651f70a1a23c5f822a035c09054dc4ad3d38':
  If oem_fingerprint_props is empty, ignore.
2014-09-19 09:31:11 +00:00
Michael Runge
5d40afe7f2 am 7914651f: Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev
* commit '7914651f70a1a23c5f822a035c09054dc4ad3d38':
  If oem_fingerprint_props is empty, ignore.
2014-09-19 04:41:22 +00:00
Dan Albert
220b01ba27 am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.
2014-09-19 00:16:16 +00:00
Dan Albert
46edd9b103 am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.
2014-09-19 00:15:23 +00:00
Dan Albert
98f7742a7f Merge "Move selection of C++ STL into the build system." 2014-09-18 23:51:53 +00:00
Dan Albert
b05f2ca150 Move selection of C++ STL into the build system.
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).

The selection of the STL is as follows:

    if LOCAL_CXX_STL == 'default'
      ifdef LOCAL_SDK_VERSION
        Use whatever STL the other NDK options have selected.
      else
        Use bionic's libstdc++ for target, GNU libstdc++ for host. This
        is compatible with the existing build options.
      endif
    else
      if LOCAL_CXX_STL == 'stlport'
        Use stlport.
      else if LOCAL_CXX_STL == 'libc++'
        Use libc++.
      else if LOCAL_CXX_STL == ''
        Don't use any STL.
      endif
    endif

Bug: 15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
2014-09-18 16:38:20 -07:00
Michael Runge
560569a617 If oem_fingerprint_props is empty, ignore.
There may be cases where there is an OEM partition
but it has no effect on the OTA itself.  In these
cases, ignore an empty value from the misc_info.txt

Change-Id: I5f467e873030765af12810a07ddd5f302ca8cc0b
2014-09-18 15:12:45 -07:00
Qiwen Zhao
d542afcb93 Merge commit 'e866294e' into lmp-mr1-dev-plus-aosp
Conflicts:
	tools/droiddoc/templates-sac/assets/images/sac_logo.png
2014-09-18 12:21:48 -07:00
Qiwen Zhao
5726fec530 Merge commit 'e866294e' into lmp-dev-plus-aosp
Conflicts:
	tools/droiddoc/templates-sac/assets/images/sac_logo.png
2014-09-18 12:19:51 -07:00
Clay Murphy
d9e4b52a38 Docs: Replacing s.a.c. Android logo to match other sites.
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
2014-09-18 16:44:21 +00:00
Jeff Arneson
ad46e7e7a1 Refactor show_annotations_list to remove HTML tags from method params
No need to pass in the HTML tags to start and end the list, since
we do the same thing everywhere, and it wasn't very complete anyways.

Change-Id: I504b78b699a03cc5ba7c6f0584173087aab2024b
2014-09-15 10:02:14 -07:00
Jeff Arneson
3b62f196e1 am faa1dc5c: Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev
* commit 'faa1dc5c016c18bb7e224bb7f16f41989d1d7c23':
  Show annotation information for fields, enums, etc. and in the class list
2014-09-12 19:20:17 +00:00
Jeff Arneson
faa1dc5c01 Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev 2014-09-12 18:24:59 +00:00
Doug Zongker
f0c58d8135 am b34fcce0: explicitly check the superblock for differences
* commit 'b34fcce08cc9ab358481e672d83ff16513c4ac37':
  explicitly check the superblock for differences
2014-09-11 18:30:54 +00:00
Jeff Arneson
9eefef66a8 Show annotation information for fields, enums, etc. and in the class list
Add the "Included in documentation due to annotations..." text for
fields, enum constants, and pretty much everything with a description.

Added annotation text to eh classes.cs file used to generate the
class list page.

Change-Id: I2685d1a34fa292088c03ccd76f2627fe954c9000
2014-09-11 11:04:58 -07:00
Doug Zongker
b34fcce08c explicitly check the superblock for differences
When generating incrementals for the system and vendor partitions,
check the first block (which contains the superblock) of the partition
to see if it's what we expect.  If this check fails, give an explicit
log message about the partition having been remounted R/W (the most
likely explanation) and the need to flash to get OTAs working again.

Bug: 17393999
Change-Id: Ifd2132b428dbc4907527291712690204a3664ac0
2014-09-11 09:38:01 -07:00
Jeff Arneson
9910016592 am 0052f75f: Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev
* commit '0052f75f88abbe4d16ff3b921be78b848fd4f6f9':
  Make the text generated by showAnnotations more noticable in docs
2014-09-11 00:23:00 +00:00
Jeff Arneson
1e7fd557dd Make the text generated by showAnnotations more noticable in docs
Made the foreground of the "included in docs by annotation..." orange,
the same color used in the header of the docs page. This text is inserted
when the showAnnotations flag is used with doclava

Change-Id: I56e0b2060ed42cd0d077fff149d578d31c763f95
2014-09-10 21:20:12 +00:00
Doug Zongker
d68530ba9a am 85448773: select default search_path by platform
* commit '854487739933f7ff33980df0c65d2bcd03b049f9':
  select default search_path by platform
2014-09-10 00:49:11 +00:00
Doug Zongker
8544877399 select default search_path by platform
Bug: 17443175
Change-Id: I2b8b0a3b56e667b749ac167a6d09dc973ecf8419
2014-09-09 15:11:13 -07:00
Jeff Arneson
c4c8bcaf85 am 5c980afc: Merge "Show annotation information in generated documentation" into lmp-dev
* commit '5c980afc5eb78f8a2361e7eb9778345bdbe26a88':
  Show annotation information in generated documentation
2014-09-08 17:00:37 +00:00
Jeff Arneson
5c980afc5e Merge "Show annotation information in generated documentation" into lmp-dev 2014-09-08 16:39:56 +00:00
Baligh Uddin
03f8a4dfb5 am 4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev
* commit '4f3d31479d5e4e8d35e60de628417cb820d69f5e':
  Add java_args as a valid option
2014-09-06 02:47:04 +00:00
Baligh Uddin
95c17467b7 am 1131d89b: Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
* commit '1131d89b426d7da401885d37a50a908c9f87d2a1':
  Add jvm args option.  I rather not hardcode some large value just for Volantis.  This can easily be passed in from sign-build.sh and should be a no-op for any other tools
2014-09-06 02:47:02 +00:00
Baligh Uddin
4f3d31479d Merge "Add java_args as a valid option" into klp-modular-dev 2014-09-06 02:19:37 +00:00
Baligh Uddin
f5085a8f94 Add java_args as a valid option
Bug: 17393134
Change-Id: If2749d03b5d409a08d415a829dd21f986cac1789
(cherry picked from commit bdc2e3186f)
2014-09-06 02:18:09 +00:00