Commit Graph

803 Commits

Author SHA1 Message Date
Joe Onorato 63170ff95d DO NOT MERGE - Add a -knowntags option to droiddoc
This lets us remove the special cases in Comment.java and specify additional
tags to not warn about for the big docs build.

Change-Id: I25ad651616f162919c56daa2d4bdf6333c9dd87d
2010-09-16 11:57:42 -04:00
Doug Zongker 8ae62ec722 am ea5d7a9d: move File and Difference classes into common script
Merge commit 'ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6' into gingerbread-plus-aosp

* commit 'ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6':
  move File and Difference classes into common script
2010-09-13 11:51:09 -07:00
Doug Zongker ea5d7a9de7 move File and Difference classes into common script
This makes them accessible from device-specific extensions (so they
can be used to send radio images as binary patches, for instance).

Change-Id: I2f2174b93b4265abf9400f9e5a0982caca0771e9
2010-09-12 15:26:16 -07:00
Doug Zongker 9314823c06 am 93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9' into gingerbread-plus-aosp

* commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9':
  return to using subprocess for running commands
2010-09-03 14:33:22 -07:00
Doug Zongker 93d574f8c5 Merge "return to using subprocess for running commands" into gingerbread 2010-09-03 14:31:03 -07:00
Doug Zongker 39a984550f return to using subprocess for running commands
Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags
argument (it wasn't working before because it was getting one argument
"-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128"
and mkyaffs2image apparently just ignores that bogus argument?)

Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d
2010-09-03 14:15:34 -07:00
Doug Zongker a4a50996ac am c637db16: remove remaining amend support
Merge commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c' into gingerbread-plus-aosp

* commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c':
  remove remaining amend support
2010-09-03 12:39:15 -07:00
Doug Zongker c637db16d8 remove remaining amend support
Remove the remaining (unused and untested) support for generating
amend scripts.  This means that you won't be able to OTA directly from
cupcake to gingerbread.

Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
2010-09-03 11:58:31 -07:00
Joe Onorato 42ee0a2a48 am cd7c775e: fix the build still
Merge commit 'cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp

* commit 'cd7c775ece6854765ae3208818e76d9d11724713':
  fix the build still
2010-08-31 13:00:56 -07:00
Joe Onorato cd7c775ece fix the build still
Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
2010-08-31 12:56:49 -07:00
Joe Onorato 0f9a91c94f am 0ee89a72: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp

* commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb':
  DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
2010-08-31 12:12:17 -07:00
Joe Onorato 0ee89a72d5 DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
2010-08-31 12:00:44 -07:00
Ying Wang a97039890e am ae553143: Refactor a bit.
Merge commit 'ae5531434877478985186dd0fb7ffefa12a74e52' into gingerbread-plus-aosp

* commit 'ae5531434877478985186dd0fb7ffefa12a74e52':
  Refactor a bit.
2010-08-26 16:07:12 -07:00
Ying Wang ae55314348 Refactor a bit.
Change-Id: I4573e7a5239536f49571d9222865e2526da573c8
2010-08-26 16:04:09 -07:00
Ying Wang cef82129e1 am aa6dbe21: Try to fix system.img in update zip file.
Merge commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6' into gingerbread-plus-aosp

* commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6':
  Try to fix system.img in update zip file.
2010-08-26 15:25:53 -07:00
Ying Wang aa6dbe2144 Try to fix system.img in update zip file.
Change-Id: Ic4f1c7478a22b1f8134ac768904e437fcfea700a
2010-08-26 15:16:22 -07:00
Ying Wang 485bd44d0d am d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp

* commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d':
  Fix mkyaffs2image extra flags in the release tools.
2010-08-25 21:19:29 -07:00
Ying Wang d421f57d22 Fix mkyaffs2image extra flags in the release tools.
Change-Id: I806e3e85ef89941edf04352331e25730c491c470
2010-08-25 20:39:41 -07:00
Ying Wang eed6860d38 am 4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd' into gingerbread-plus-aosp

* commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd':
  Fix mkbootimg parameters for releasetools.
2010-08-25 15:04:45 -07:00
Ying Wang 4de6b5bfc8 Fix mkbootimg parameters for releasetools.
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
2010-08-25 14:30:17 -07:00
Bill Napier 1ad1380599 am 0962b719: Merge "DO NOT MERGE: Fix the build by ignoring directories that don\'t exist." into gingerbread
Merge commit '0962b71980b7e850a1ef87766ae12de16ab2efb4' into gingerbread-plus-aosp

* commit '0962b71980b7e850a1ef87766ae12de16ab2efb4':
  DO NOT MERGE: Fix the build by ignoring directories that don't exist.
2010-08-25 10:10:49 -07:00
Bill Napier 10cd7f9969 DO NOT MERGE: Fix the build by ignoring directories that don't exist.
Change-Id: I97ba9eca73f020eae0fa36ae94db35e70c9985d3
2010-08-25 10:00:20 -07:00
Rohit Mungee cdc1d6f457 am cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread
Merge commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp

* commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd':
  Add support for multiple html directories to droiddoc.
2010-08-24 23:01:32 -07:00
Rohit Mungee cb92616f11 Merge "Add support for multiple html directories to droiddoc." into gingerbread 2010-08-24 22:58:30 -07:00
Bill Napier 0e143c0ed9 Add support for multiple html directories to droiddoc.
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.

Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
2010-08-24 22:16:01 -07:00
Ying Wang 567ec8ede3 am ee4bad51: Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Merge commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51' into gingerbread-plus-aosp

* commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51':
  Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
2010-08-24 11:50:46 -07:00
Ying Wang ee4bad51bc Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Original CL: 59920

Change-Id: I81437996670a61e10284293d25a08da8907ad296
2010-08-24 11:18:07 -07:00
Ying Wang d3b973d897 am 065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp

* commit '065521be4fd6965058fbd599bb43fe13101fee7c':
  Backport ext4 support from master [DO NOT MERGE]
2010-08-23 11:49:10 -07:00
Ying Wang 065521be4f Backport ext4 support from master [DO NOT MERGE]
ext4 support is needed by crespo.

Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
2010-08-23 11:34:40 -07:00
Scott Main 240782f2bd am 6eea9363: am 4f2436dc: update carousel icon for nexus one dev phone
Merge commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6' into gingerbread-plus-aosp

* commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6':
  update carousel icon for nexus one dev phone
2010-08-05 15:18:06 -07:00
Scott Main b7256fd685 am be4696e0: am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit 'be4696e073b93e0e65f767e77166a08efd67c6cb' into gingerbread-plus-aosp

* commit 'be4696e073b93e0e65f767e77166a08efd67c6cb':
  Doc change: Add nexus one to dev phones image.
2010-08-05 15:18:03 -07:00
Scott Main 6eea9363f4 am 4f2436dc: update carousel icon for nexus one dev phone
Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread

* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
  update carousel icon for nexus one dev phone
2010-08-05 15:10:05 -07:00
Scott Main be4696e073 am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread

* commit '7589398cf9127987a768ccfb3dbb9cde54d00f02':
  Doc change: Add nexus one to dev phones image.
2010-08-05 15:10:03 -07:00
Brian Carlstrom f9be43305a am 7dc35a3b: Tracking merge of dalvik-dev to gingerbread
Merge commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp

* commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:23 -07:00
Scott Main 4f2436dc35 update carousel icon for nexus one dev phone
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
2010-08-05 09:44:47 -07:00
Brian Carlstrom 7dc35a3b9c Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
2010-08-04 23:17:47 -07:00
Dirk Dougherty 35e642f768 Doc change: Add nexus one to dev phones image.
Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
2010-07-23 14:39:41 -07:00
Scott Main 21bd43a3d9 am 81f42236: am 9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '81f42236e2971caac9354686d7acbe40f3fe0f4e' into gingerbread-plus-aosp

* commit '81f42236e2971caac9354686d7acbe40f3fe0f4e':
  docs: ensure code-ified links in qv are the proper color
2010-07-15 16:46:26 -07:00
Scott Main 81f42236e2 am 9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread

* commit '9269a711753f2523acd3fe5ae661559f754a1bd0':
  docs: ensure code-ified links in qv are the proper color
2010-07-15 16:43:38 -07:00
Scott Main 9269a71175 docs: ensure code-ified links in qv are the proper color
Change-Id: I61dd859e0749573746c9bfcbf224758463370ba7
2010-07-15 11:21:56 -07:00
Joe Onorato 84843e6843 am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread
Merge commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5' into gingerbread-plus-aosp

* commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5':
  Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
2010-07-15 11:10:29 -07:00
Joe Onorato b751053151 Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers.  Then produce a file that's filtered
for what's going to be installed.

Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
2010-07-14 10:22:54 -07:00
The Android Open Source Project 39a6a64471 merge from open-source master
Change-Id: Ic005b0772e144fc986fd3bacc67d5840b16efb81
2010-07-09 14:57:26 -07:00
Bruce Beare 69ef5ce4f0 Create systemtarball either with bz2 or gz
Change-Id: I64e93872942e8dcad4a894a906be7912bb6da308
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 16:36:05 -07:00
Scott Main 38d2e1dacd am b66a5c05: docs: modify redirect link text
Merge commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread

* commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
  docs: modify redirect link text
2010-07-08 11:42:13 -07:00
Scott Main b66a5c0574 docs: modify redirect link text
Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec
2010-07-08 11:34:45 -07:00
Kenny Root afb36e7e86 Clean up warnings in soslim
Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5
2010-06-26 22:43:55 -07:00
Scott Main 62c6566558 am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into gingerbread

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:12:45 -07:00
Scott Main fe75781ee9 am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into froyo-plus-aosp

* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
  docs: show the download message on the SDK homepage because we no longer
2010-06-24 18:11:52 -07:00
Scott Main 81b68ad95d Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo 2010-06-24 18:10:32 -07:00
Scott Main a1b358a22c docs: show the download message on the SDK homepage because we no longer
need to walk through the TOS

Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
2010-06-24 17:57:50 -07:00
Doug Zongker bf77b69422 am 3b85269c: include build timestamp in OTA metadata
Merge commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into froyo-plus-aosp

* commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
  include build timestamp in OTA metadata
2010-06-21 15:42:14 -07:00
Doug Zongker 06acf91f65 am 3b85269c: include build timestamp in OTA metadata
Merge commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into gingerbread

* commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
  include build timestamp in OTA metadata
2010-06-21 15:40:21 -07:00
Doug Zongker 3b85269cfe include build timestamp in OTA metadata
Change-Id: I44292c6346db3356dfafbd044027e37a9b467cfe
2010-06-21 15:31:39 -07:00
Jing Yu ada132a80b Switch toolchain from gcc-4.4.0 to gcc-4.4.3
gcc-4.4.3 toolchain is based on fsf GCC-4.4.3 with numerous patches.
It reduces 3.65% code size than the prebuilt gcc-4.4.0 toolchain,
and improves 3.4% performance on Android benchmarks.

The toolchain uses gold as default linker. With gold, the toolchain
further reduces 1MB system image.

Change-Id: I55eb4df185f2932e71498fcc28428e4d1b175393
2010-06-16 20:17:19 -07:00
Ying Wang c01cf7b9e6 resolved conflicts for merge of 2b8d2383 to gingerbread
Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
2010-06-15 15:11:51 -07:00
Joe Onorato 8aeb7cc461 am 2b8d2383: Merge changes I02214abd,I79e6f60e into froyo
Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp

* commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1':
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
2010-06-15 14:24:42 -07:00
Joe Onorato da12daf15f Add a tapas command.
(Actually there was a tapas command that just called choosecombo).

The new better tapas command is for building unbundled apps.  Run
it with one or more modules to build and optionally a build variant.

tapas [variant] App1 App2 ...

If you don't supply a build variant, it defaults to eng.

Change-Id: I02214abd0b5ad02e364fcb024e10cf6ad17a9e68
2010-06-10 18:38:37 -07:00
Joe Onorato 16fa4b290e Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Change-Id: I79e6f60e009dad3a48709962347441e4ca0c337a
2010-06-10 18:38:25 -07:00
Ying Wang ab251d9c80 am 7a794289: Merge "Unbundle the build system." into froyo
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into froyo-plus-aosp

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
2010-06-09 11:33:36 -07:00
Ying Wang 66356cef22 am 7a794289: Merge "Unbundle the build system." into froyo
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into kraken

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
  Unbundle the build system.
2010-06-09 11:33:32 -07:00
Ying Wang 0f6f4ca54e Unbundle the build system.
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
2010-06-09 10:26:26 -07:00
Scott Main b7ebe01f60 am ca671ab7: Revert "Doc change: Update froyo mark for home"
Merge commit 'ca671ab7a661625e021f2145e2d01f39d542fb28' into froyo-plus-aosp

* commit 'ca671ab7a661625e021f2145e2d01f39d542fb28':
  Revert "Doc change: Update froyo mark for home"
2010-05-25 12:31:29 -07:00
Scott Main ca671ab7a6 Revert "Doc change: Update froyo mark for home"
This reverts commit 9d1d6441d9.
2010-05-25 12:22:29 -07:00
Dirk Dougherty d44754e0e5 am e9b01eb4: Doc change: add tv assets for carousel.
Merge commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0' into froyo-plus-aosp

* commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0':
  Doc change: add tv assets for carousel.
2010-05-20 00:15:38 -07:00
Dirk Dougherty e9b01eb46d Doc change: add tv assets for carousel.
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
2010-05-19 19:42:12 -07:00
Dirk Dougherty e5cfdbfb17 am 9d1d6441: Doc change: Update froyo mark for home
Merge commit '9d1d6441d97eeea80c70c549646d7c177936e148' into froyo-plus-aosp

* commit '9d1d6441d97eeea80c70c549646d7c177936e148':
  Doc change: Update froyo mark for home
2010-05-19 18:58:05 -07:00
Dirk Dougherty 9d1d6441d9 Doc change: Update froyo mark for home
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
2010-05-19 18:25:33 -07:00
The Android Open Source Project 9514fca5c7 merge from open-source master
Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03
2010-05-14 13:38:55 -07:00
Jean-Baptiste Queru be6b55ccc2 Merge "Support absolute path, in OUT_DIR" 2010-05-14 12:17:43 -07:00
Scott Main de14ee5701 am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected
Merge commit '3494d9b3deeb9967be247bf31cdaa3fd30fb4207' into froyo-plus-aosp

* commit '3494d9b3deeb9967be247bf31cdaa3fd30fb4207':
  docs: lighten the "new" red. softens the effect and makes it more legible when selected
2010-05-10 10:26:20 -07:00
Scott Main 3494d9b3de docs: lighten the "new" red. softens the effect and makes it more legible when selected
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
2010-05-10 10:01:13 -07:00
Scott Main 9096ef382a am 3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo
Merge commit '3044d243c99f46030521fce650add82db640046a' into froyo-plus-aosp

* commit '3044d243c99f46030521fce650add82db640046a':
  add froyo graphic for homepage and fix css bug
2010-05-10 09:43:15 -07:00
Scott Main ae98747d7c add froyo graphic for homepage and fix css bug
Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db
2010-05-06 11:43:08 -07:00
Scott Main e59de21b8a am 74108dea: fix css bug for paragraphs in table cells - only select the direct descendant for p:last-child in a td
Merge commit '74108deaf1747943a493751cbff9de321f1dd397' into froyo-plus-aosp

* commit '74108deaf1747943a493751cbff9de321f1dd397':
  fix css bug for paragraphs in table cells
2010-05-04 18:18:02 -07:00
Scott Main 74108deaf1 fix css bug for paragraphs in table cells
- only select the direct descendant for p:last-child in a td

Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649
2010-05-04 17:24:26 -07:00
The Android Open Source Project ae4e14556b merge from open-source master
Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
2010-05-03 16:11:04 -07:00
Alexey Tarasov 73fda1b973 Make expr more POSIXy
Change-Id: I939cf1f227c14112656804d69c1afd7ead4a31ed
2010-04-29 14:19:28 -07:00
Bruce Beare c25e503207 generic_x86 support
Add in Makefiles and support files for x86 builds
  Based on changes by: wonjong.lee <wonjong.lee@windriver.com>
  Additional changes by: Mark Gross <mark.gross@intel.com>
  Additional changes by: Bruce Beare <brucex.j.beare@intel.com>

Change-Id: Id087411b282b1b68a0251e7f9cbbdde183549787
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-04-28 16:52:51 -07:00
Doug Zongker 2ea21065b6 add metadata to OTA package in easily-parsed form
This is only for use by the tools that manipulate OTA packages; it
doesn't touch device code.

Change-Id: I1e21b24b86340d8f86c9d15b2aeb79c461f75d18
2010-04-28 16:05:51 -07:00
Scott Main c3d808a727 Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo 2010-04-27 14:23:04 -07:00
Raphael 4c70244cb1 Make zipalign build for the Win SDK under Linux.
(Merge master Change Ibd667437)
2010-04-23 13:15:37 -07:00
Scott Main 7f418a518b support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct

Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
2010-04-23 11:41:30 -07:00
Scott Main d72731d213 docs: misc css changes
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell

Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660
2010-04-20 15:35:49 -07:00
Scott Main f655dab5e6 Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo 2010-04-20 15:34:22 -07:00
Roman Nurik af23298447 cherry-pick from master: 42092024eb
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.

Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda
2010-04-19 15:18:41 -07:00
Scott Main 7a0090b316 docs: add script to capture the ctrl+f key event (initiates 'find' search
on the page) and expand all inherited members.

Also move the appropriate methods from -docs.js into -reference.js where
they belong and add some function documentation.

Change-Id: I421bbf27d3b41d377776b3d64a97380458fcebd6
2010-04-16 09:05:06 -07:00
Wu-cheng Li fcc7cf7799 Fix the check of double quoted @see tag.
Originally \n was not discarded so a balanced quoted string still
has compile error.

bug:2553570
Change-Id: I073c0c0ba370d55493d3ee6d17c7ebe9f42afe7a
2010-04-13 23:49:18 +08:00
Scott Main 7b6cee7653 cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
docs: various stylesheet changes
indent tables
revise figure class
add caption classes for tables and images
add styles for xml reference docs (used by resource types docs)
tweak styles for the icon tables to eliminate obscure 'caption' class

Change-Id: I23f53d884f39a5f6a4b45172186e0d1c7619da30
2010-04-08 17:32:02 -07:00
Dirk Dougherty 4b2eb9734f cherry-pick db00a226071878ae9bd821d28903dca8f6071140 to froyo.
Change-Id: I2ba25432014c7f04748cd6502d6ded997ef21f48
2010-03-26 18:59:47 -07:00
Dirk Dougherty e123385cca cherry-pick fe0104041858046a0aa649c791869d7eb1a5c175 to froyo.
Change-Id: I9c95ebc6f735cb6abc2b0920c2274e0b5ce0ef70
2010-03-26 18:56:30 -07:00
Scott Main 84f8a5e2ef docs: remove sidebox-inner style
Change-Id: Ia1e1b10e6756ecf6c9154c2cc25d0dbd58c1907f
2010-03-24 17:20:39 -07:00
Scott Main b89740f8ba docs: stylesheet change for figure class
Change-Id: I1f47fc70382daf9f14e057a83375cf727fb8afa7
2010-03-24 13:49:49 -07:00
Scott Main c9be89296a Merge "docs: style tweaks to sidebox and qv classes" 2010-03-24 13:47:22 -07:00
Doug Zongker 7afc97120b Merge "fix typo (leftover from some debugging code)" 2010-03-17 17:46:58 -07:00
Dan Egnor 5fe3b35846 Allow explicit and implicit numbering of the same tag.
Change-Id: I59c24cc211250da7e0aed9e0b0aa16517fd72d55
2010-03-17 16:59:12 -07:00
Doug Zongker 3475d362a7 fix typo (leftover from some debugging code)
Change-Id: I29a42820ccf8567508f1aeefcc89c2462e9ad43c
2010-03-17 16:39:30 -07:00
Scott Main 67c2a965bb docs: style tweaks to sidebox and qv classes
Removes extra whitespace from above the sidebox class and
adjusts the inner padding.

Removes extra whitespace from the right side of the quickview box
to align with the document margin.

Change-Id: I3d37ecc9a251a2c5c4e8d2c2942d05848c698faa
2010-03-16 17:18:24 -07:00
Doug Zongker 283e2a1e1b store filesystem config info in target files at build time
Store a dump of the desired uid/gid/mode for every system file in the
target_files zip.  Modify ota_from_target_files to use this stored
information when it is available, instead of running fs_config from
the current client (which might be out of sync from the one where the
target_files zip was built).

b/2516887 - New android_filesystem_config.h needed

Change-Id: I8409a0265d1d50daad9c2bc033c99b74b8931b20
2010-03-15 18:04:15 -07:00
Colin Cross c208ccb73d Merge "Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt" 2010-03-10 18:14:31 -08:00