Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: jellybean
Commits on Jul 15, 2012
  1. @wjb

    mods to build pa for jellybean

    wjb authored
    Change-Id: I06a9126fe56cf26fd8c663ff03a26794aea180a3
Commits on Jun 22, 2012
  1. @scottamain

    Changes for dac2 design

    scottamain authored
    Change-Id: I755581b3db5664d3db429185bb18de1ad7a471cb
Commits on Apr 24, 2012
  1. @ddougherty

    am aae56c1: am dd4d20d: am 880940a: Doc change: add schema.org metadata.

    ddougherty authored Android Git Automerger committed
    * commit 'aae56c125e8f03dd09427faac163f9c224344f59':
  2. @ddougherty

    am f3cc38a: am 60b98a3: am 880940a: Doc change: add schema.org metadata.

    ddougherty authored Android Git Automerger committed
    * commit 'f3cc38a60ed4642f35b307602e2516f7bcd45ff1':
Commits on Apr 20, 2012
  1. @ddougherty

    am 880940a: Doc change: add schema.org metadata.

    ddougherty authored Android Git Automerger committed
    * commit '880940ad7dc601eecdd4317b4210b059a747ee2a':
      Doc change: add schema.org metadata.
  2. @ddougherty

    am dd4d20d: am 880940a: Doc change: add schema.org metadata.

    ddougherty authored Android Git Automerger committed
    * commit 'dd4d20dd2efef0130d55951ba09c34693faef653':
  3. @ddougherty

    am 60b98a3: am 880940a: Doc change: add schema.org metadata.

    ddougherty authored Android Git Automerger committed
    * commit '60b98a38b83e2cdc3873392cca1356a6cd60989d':
      Doc change: add schema.org metadata.
  4. @ddougherty

    am 880940a: Doc change: add schema.org metadata.

    ddougherty authored Android Git Automerger committed
    * commit '880940ad7dc601eecdd4317b4210b059a747ee2a':
      Doc change: add schema.org metadata.
  5. @ddougherty

    am 880940a: Doc change: add schema.org metadata.

    ddougherty authored Android Git Automerger committed
    * commit '880940ad7dc601eecdd4317b4210b059a747ee2a':
      Doc change: add schema.org metadata.
Commits on Apr 19, 2012
  1. @ddougherty

    Doc change: add schema.org metadata.

    ddougherty authored
    Change-Id: I17a799ff812eb66b647f26040f12ad0f651bd471
Commits on Mar 27, 2012
  1. @dsandler

    Elucidate text API parsing errors.

    dsandler authored
    Previously, if current.txt had an error, apicheck would fail over
    to XML parsing and then (naturally) give an inscrutable SAX error.
    
    Now both text and XML errors are described in the output
    stream to help in diagnosing failures.
    
    Change-Id: Ie3aec370b15e42ddf9a941ffa3ce8ae32a1da1b6
Commits on Mar 21, 2012
  1. am 70b82c7: am 4db6025: Reconcile with ics-mr1-release

    The Android Open Source Project authored Android Git Automerger committed
    * commit '70b82c719ea95d3b4b68c4cf5f0ef257120039f5':
  2. am 4db6025: Reconcile with ics-mr1-release

    The Android Open Source Project authored Android Git Automerger committed
    * commit '4db6025083ff4abff3e682d6b81ca40bf7e843fa':
  3. Reconcile with ics-mr1-release

    The Android Open Source Project authored
    Change-Id: I254d144621e8a8cc5e5956489b9cfd2e4dd927aa
  4. am f0631ff: Reconcile with ics-mr1-release

    The Android Open Source Project authored Android Git Automerger committed
    * commit 'f0631ff39075e7da2fcae7b52c68a0ad3b0abfd1':
  5. Reconcile with ics-mr1-release

    The Android Open Source Project authored
    Change-Id: Ia57adebd52f816b4c6ba17221867ddd9bcc3fa3b
Commits on Mar 10, 2012
  1. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger authored
  2. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger authored
Commits on Mar 8, 2012
  1. am 3352706: Add custom template for /design path

    Roman Nurik authored Android Git Automerger committed
    * commit '3352706b85f0c1aa8a0391b26c08c8b6f9e5746f':
      Add custom template for /design path
Commits on Mar 6, 2012
  1. Add custom template for /design path

    Roman Nurik authored
    Change-Id: I50e88501cec2a386054fcd5974b5cbfeb73325eb
Commits on Mar 1, 2012
  1. am b099bab: (-s ours) Fix doclava to preserve annotations on fields a…

    Tor Norbye authored Android Git Automerger committed
    …nd methods - do not merge.
    
    * commit 'b099bab402ee11e80bc5d7e420540350afc4dfc0':
      Fix doclava to preserve annotations on fields and methods - do not merge.
Commits on Feb 29, 2012
  1. Fix doclava to preserve annotations on fields and methods - do not me…

    Tor Norbye authored Xavier Ducrohet committed
    …rge.
    
    The android.jar stubs file used in the SDK was missing @Deprecated
    annotations on methods and fields.
    
    This changeset updates doclava to write annotations on methods and
    fields as well, and to also add a @Deprecated annotation for APIs that
    were marked deprecated but missing an annotation (presumably because
    they only used the @deprecated doc comment; there are about 30 such
    APIs out of 800+ deprecation usages.)
    
    This fixes
    http://code.google.com/p/android/issues/detail?id=26173
    
    (cherry picked from commit 7393488)
    
    Change-Id: I7b78c481ed043df20ecdc4fc59515566b70ebbc1
  2. Fix doclava to preserve annotations on fields and methods

    Tor Norbye authored
    The android.jar stubs file used in the SDK was missing @Deprecated
    annotations on methods and fields.
    
    This changeset updates doclava to write annotations on methods and
    fields as well, and to also add a @Deprecated annotation for APIs that
    were marked deprecated but missing an annotation (presumably because
    they only used the @deprecated doc comment; there are about 30 such
    APIs out of 800+ deprecation usages.)
    
    This fixes
    http://code.google.com/p/android/issues/detail?id=26173
    
    Change-Id: Iad675d4cfdf650165bfb7050cdcc0978c3a72d55
Commits on Feb 2, 2012
  1. @scottamain

    am 73fc10a: docs: add support for meta description in the doclava <he…

    scottamain authored Android Git Automerger committed
    …ad>; docs can optionally add a page.metaDescription definition to the document HDF data (above the @jd:body).
    
    * commit '73fc10a67d65cd077e5ff5c4bb2d91f2208ab338':
      docs: add support for meta description in the doclava <head>; docs can optionally add a page.metaDescription definition to the document HDF data (above the @jd:body).
Commits on Feb 1, 2012
  1. @scottamain

    docs: add support for meta description in the doclava <head>;

    scottamain authored
    docs can optionally add a page.metaDescription definition to the document
    HDF data (above the @jd:body).
    
    Change-Id: I6e29f9b409e5c4adca5dfd7e78525f9752ca3bc9
Commits on Jan 30, 2012
  1. @scottamain

    am b7ec906: docs: add meta data based on schema.org

    scottamain authored Android Git Automerger committed
    * commit 'b7ec9068e31cb19e3ccf7ab09ae6c092af343e0d':
      docs: add meta data based on schema.org
  2. @scottamain

    docs: add meta data based on schema.org

    scottamain authored
    Change-Id: Icacc1efc85b316278005121d049ec4476b6a0b24
Commits on Jan 12, 2012
  1. @scottamain

    am 1be4b15: doclava: don\'t print "since api level" string if there\'…

    scottamain authored Android Git Automerger committed
    …s no level available
    
    * commit '1be4b1524f27696c9c71b78468742c162dd0b9c1':
      doclava: don't print "since api level" string if there's no level available
Commits on Jan 11, 2012
  1. @scottamain

    doclava: don't print "since api level" string if there's no level ava…

    scottamain authored
    …ilable
    
    Change-Id: I20d3a61bcd73bdebcbefc7db3e57f213e04b5802
Commits on Nov 16, 2011
  1. @JesusFreke

    Update the module name for the antlr runtime dependency

    JesusFreke authored
    Change-Id: Ia1ddfb1401ee598926948e456342bc99d2dd7386
    Signed-off-by: Ben Gruver <bgruv@google.com>
Commits on Sep 28, 2011
  1. Fail loudly when there's an error parsing an API XML file.

    Jesse Wilson authored
    We were previously using the same error code for a missing
    version on a member (shouldn't be fatal) and a broken XML file
    (should be fatal).
    
    This makes the broken XML case fatal, and includes the reason
    why.
    
    Change-Id: Ia65d07544b8cb8ac95896cd451930ed37d69ee57
Commits on Sep 13, 2011
  1. @scottamain

    Add training/ directory to path of docs to use the resources tab (usi…

    scottamain authored
    …ng docpage.cs)
    
    Change-Id: I50ea30d4447d25ff60b761e8be77065917cc686b
Commits on Jul 28, 2011
  1. @scottamain

    docs: remove "since" info for xml attributes because we don't have it

    scottamain authored
    Change-Id: I0d1a7a4b25956bb9b5c214c414cfa444f22ff8fd
Commits on Jun 27, 2011
  1. Rewrote comment parsing to be much faster.

    Andrew Sapperstein authored
    Now uses plain string parsing rather than regex to parse
    the comments. Timing is both more accurate and lower
    by about 40 percent on my machine.
    
    Change-Id: I73a0bac3c49571dcb71b499b738966cde27c1c29
Commits on Jun 21, 2011
  1. Parsing entire tree and resolving all conflicts.

    Andrew Sapperstein authored
    Unfortunately, this takes 3 passes (1 parse and 2 resolve passes)
    due to one corner case (where you refer to something that is inside a superclass
    that is in a different package). Fortunately, there are only
    3 or 4 resolutions on the third pass.
    
    Change-Id: I14dc6e61e002058132b8065a7b31abb87ac8f2a1
Something went wrong with that request. Please try again.