Commit Graph

1416 Commits

Author SHA1 Message Date
Scott Main 32b505d984 am 8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs.
Merge commit '8e44ae9c762785d80e54bc75e2ba353f486414ec' into eclair

* commit '8e44ae9c762785d80e54bc75e2ba353f486414ec':
  docs: fix IE6 bug in which tabs are not focusable
2009-10-30 15:04:17 -07:00
Scott Main 8e44ae9c76 docs: fix IE6 bug in which tabs are not focusable
while in the reference. also increase the minimum
width for the header to avoid line-wrapping of the tabs.
2009-10-30 13:33:39 -07:00
Mike Reed 8dd26ee452 remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
i.e. if NDEBUG is defined, then SK_RELEASE will get defined in the skia config headers
2009-10-30 08:32:28 -04:00
Dan Egnor 8f313a35f8 am b4df557e: am d1850e73: Fix incremental build break in openssl.
Merge commit 'b4df557ed9c42dc05c1a1f81aa7d44e4b96d862f'

* commit 'b4df557ed9c42dc05c1a1f81aa7d44e4b96d862f':
  Fix incremental build break in openssl.
2009-10-29 13:26:27 -07:00
Dan Egnor b4df557ed9 am d1850e73: Fix incremental build break in openssl.
Merge commit 'd1850e739b0e6d5f788349db0bddb8277757f800' into eclair-mr2-plus-aosp

* commit 'd1850e739b0e6d5f788349db0bddb8277757f800':
  Fix incremental build break in openssl.
2009-10-29 13:15:33 -07:00
Dan Egnor d1850e739b Fix incremental build break in openssl. 2009-10-29 13:05:27 -07:00
Scott Main a06f395a0a am 4ffcb763: am df0ca900: am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d'

* commit '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-29 01:59:40 -07:00
Scott Main 4ffcb76344 am df0ca900: am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f' into eclair-mr2-plus-aosp

* commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-29 01:51:53 -07:00
Dan Egnor 2b738b4d15 am eda684a2: am a6b495ce: Clean frameworks after replacing IDropBox.aidl with IDropBoxService.aidl, which causes some build confusion with dependencies and Parcelables and so on.
Merge commit 'eda684a2666a98d38e7620b59ffd4e335a4f27f6'

* commit 'eda684a2666a98d38e7620b59ffd4e335a4f27f6':
  Clean frameworks after replacing IDropBox.aidl with
2009-10-29 01:34:38 -07:00
android-build SharedAccount 96fb8fef18 resolved conflicts for merge of 01e7a68f to master 2009-10-29 01:31:08 -07:00
Scott Main df0ca90073 am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-mr2

* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-29 01:25:23 -07:00
Jean-Baptiste Queru c4ec93ec84 am 110dd464: merge from open-source master
Merge commit '110dd46414574da42c4f07b629b31977d144a849'

* commit '110dd46414574da42c4f07b629b31977d144a849': (46 commits)
  DRC65
  DRC63C
  DRC63B
  DRC63
  DRC62
  DRC59
  DRC58C
  DRC58B
  DRC58
  DRC52
  DRC51
  DRC50
  DRC49
  DRC48
  DRC45B
  DRC45
  DRC44
  DRC43
  DRC42
  DRC37B
  ...
2009-10-28 23:57:08 -07:00
Scott Main 8866d26c67 am df5e7f7b: am eae4fc96: am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit 'df5e7f7b575bf61b9e94a17dd57ea97bcae07a4e'

* commit 'df5e7f7b575bf61b9e94a17dd57ea97bcae07a4e':
  fix search for offline docs. again.
2009-10-28 23:48:21 -07:00
Dirk Dougherty 3e7a1470c1 am e528cbdc: am 12313686: am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab'

* commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-28 23:48:14 -07:00
Dan Egnor eda684a266 am a6b495ce: Clean frameworks after replacing IDropBox.aidl with IDropBoxService.aidl, which causes some build confusion with dependencies and Parcelables and so on.
Merge commit 'a6b495ce40f640f581e27ebd8d935d706daa9f2d' into eclair-mr2-plus-aosp

* commit 'a6b495ce40f640f581e27ebd8d935d706daa9f2d':
  Clean frameworks after replacing IDropBox.aidl with
2009-10-28 17:22:05 -07:00
android-build SharedAccount 01e7a68fd0 am 8a5d5272: resolved conflicts for merge of 3fa11599 to eclair-mr2
Merge commit '8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp

* commit '8a5d527223414c3c23b8021eb8ed468d3299e968':
  Bump version to 2.1 API 6.
2009-10-28 17:21:53 -07:00
Dan Egnor a6b495ce40 Clean frameworks after replacing IDropBox.aidl with
IDropBoxService.aidl, which causes some build confusion
with dependencies and Parcelables and so on.

(Will be checked in immediately after the change in question)
2009-10-28 16:25:47 -07:00
android-build SharedAccount 8a5d527223 resolved conflicts for merge of 3fa11599 to eclair-mr2 2009-10-28 16:12:11 -07:00
Jean-Baptiste Queru 110dd46414 merge from open-source master 2009-10-28 14:57:01 -07:00
Scott Main df5e7f7b57 am eae4fc96: am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit 'eae4fc960cec88f50eea7ae65f85f5722b0ad26b' into eclair-mr2-plus-aosp

* commit 'eae4fc960cec88f50eea7ae65f85f5722b0ad26b':
  fix search for offline docs. again.
2009-10-28 10:42:13 -07:00
Dirk Dougherty e528cbdcb5 am 12313686: am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '12313686fb731e79224067ed13749c2c4dae4256' into eclair-mr2-plus-aosp

* commit '12313686fb731e79224067ed13749c2c4dae4256':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-28 10:42:08 -07:00
Scott Main eae4fc960c am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit '836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-mr2

* commit '836a695f01799566969c12d5c83459bdb5d8b2c2':
  fix search for offline docs. again.
2009-10-28 10:30:34 -07:00
Dirk Dougherty 12313686fb am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-mr2

* commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-28 10:26:52 -07:00
Scott Main a42091e426 am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-plus-aosp

* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-27 17:50:58 -07:00
Scott Main a7d1eaf572 am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts.
Merge commit '9b5fdb9c23f9301d1a963a6e9be4b46ad70922d7' into eclair

* commit '9b5fdb9c23f9301d1a963a6e9be4b46ad70922d7':
  docs: add checkbox to toggle the api level filter on and off;
2009-10-27 17:39:37 -07:00
Scott Main 9b5fdb9c23 docs: add checkbox to toggle the api level filter on and off;
this includes some function renaming for the related scripts.

the checkbox will be unchecked by default, so any users
that currently have an api level filter selected will now
see all apis until they click the checkbox. the old api level
cookie is still saved the same, but the selected value will only
be applied if the checkbox is selected, which has its own cookie
for on or off.
2009-10-27 16:56:08 -07:00
Dianne Hackborn b8906579ab am 3fa11599: Bump version to 2.1 API 6.
Merge commit '3fa115999c8512095301724f557821f25ddfe08f' into eclair-plus-aosp

* commit '3fa115999c8512095301724f557821f25ddfe08f':
  Bump version to 2.1 API 6.
2009-10-27 12:57:08 -07:00
Android (Google) Code Review 704181ee5b Merge change I3bb7eab9
* changes:
  Rebuild target object files with new GCC 4.4.0 toolchain.
2009-10-27 15:54:19 -04:00
Dianne Hackborn 3fa115999c Bump version to 2.1 API 6.
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
2009-10-26 17:40:19 -07:00
Scott Main 555cca7d31 am 836a695f: am f1bac52f: fix search for offline docs. again.
Merge commit '836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-plus-aosp

* commit '836a695f01799566969c12d5c83459bdb5d8b2c2':
  fix search for offline docs. again.
2009-10-26 15:50:36 -07:00
Scott Main 836a695f01 am f1bac52f: fix search for offline docs. again.
Merge commit 'f1bac52fe28ba503c63c929d9d0711671273635f' into eclair

* commit 'f1bac52fe28ba503c63c929d9d0711671273635f':
  fix search for offline docs. again.
2009-10-26 15:41:42 -07:00
Jean-Baptiste Queru b51df61592 merge from open-source master 2009-10-26 15:14:42 -07:00
Scott Main f1bac52fe2 fix search for offline docs. again. 2009-10-26 14:44:48 -07:00
Dirk Dougherty 59de278178 am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-plus-aosp

* commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-26 11:28:19 -07:00
Dirk Dougherty ee3a3c1f59 am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit 'c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259' into eclair

* commit 'c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259':
  doc change: include SDK Tools in notice to 1.6 developers.
2009-10-26 11:18:47 -07:00
Dirk Dougherty c2c5e505ac doc change: include SDK Tools in notice to 1.6 developers.
Bug:2160782
Change-Id: Ib70255c889495df7dbb958fe51977735554a0912
2009-10-24 14:38:58 -07:00
Scott Main 3f19cc16b6 am 66a27b01: am 214ea8f1: am 3af366dd: am 462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '66a27b01201027e371b74b0eb18572dfb7303238'

* commit '66a27b01201027e371b74b0eb18572dfb7303238':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:32:32 -07:00
Scott Main 66a27b0120 am 214ea8f1: am 3af366dd: am 462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '214ea8f14ee2b62b80905ad038110066f95be84b' into eclair-mr2-plus-aosp

* commit '214ea8f14ee2b62b80905ad038110066f95be84b':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:23:04 -07:00
Scott Main 214ea8f14e am 3af366dd: am 462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '3af366ddb2634f97f440b1437bbd21d00101c93b' into eclair-mr2

* commit '3af366ddb2634f97f440b1437bbd21d00101c93b':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:13:32 -07:00
Scott Main a1ff4fccee am 3af366dd: am 462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '3af366ddb2634f97f440b1437bbd21d00101c93b' into eclair-plus-aosp

* commit '3af366ddb2634f97f440b1437bbd21d00101c93b':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:13:26 -07:00
Scott Main 3af366ddb2 am 462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '462cc37742b4e7d8e348ac9264eb3e5e35cbfeef' into eclair

* commit '462cc37742b4e7d8e348ac9264eb3e5e35cbfeef':
  docs: implement sdk announcement in a collapsible box
2009-10-23 21:04:02 -07:00
Scott Main bd4b2f7b7f am c41d2516: am 11cb880f: am e0ac5c3e: am 0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit 'c41d251615431a36fc3b664d2bdbe749702a11d9'

* commit 'c41d251615431a36fc3b664d2bdbe749702a11d9':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:29:02 -07:00
Scott Main c41d251615 am 11cb880f: am e0ac5c3e: am 0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '11cb880f1ef5296cb9eb1aff478808248eb7fe6b' into eclair-mr2-plus-aosp

* commit '11cb880f1ef5296cb9eb1aff478808248eb7fe6b':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:19:06 -07:00
Scott Main de5108cc5e am e0ac5c3e: am 0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9' into eclair-plus-aosp

* commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:08:49 -07:00
Scott Main 11cb880f1e am e0ac5c3e: am 0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9' into eclair-mr2

* commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:08:14 -07:00
Scott Main e0ac5c3e86 am 0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '0d8872e6f2462a947c1543b88a7a353072b808e3' into eclair

* commit '0d8872e6f2462a947c1543b88a7a353072b808e3':
  docs: change javascript so that SDK docs that are not
2009-10-23 17:00:25 -07:00
Scott Main 462cc37742 docs: implement sdk announcement in a collapsible box
and revise the 'special' box color and add rounded corners.
2009-10-23 16:47:09 -07:00
Elliott Hughes 3bb7eab9ca Rebuild target object files with new GCC 4.4.0 toolchain.
Bug: 2139334
2009-10-23 16:20:21 -07:00
Scott Main 3bdae948b1 am ac1e24cc: am 7a0ec6b5: am f963ee63: am 60dba894: docs: add eclair logo for homepage
Merge commit 'ac1e24ccd622b17f5054460b40baad2e07585781'

* commit 'ac1e24ccd622b17f5054460b40baad2e07585781':
  docs: add eclair logo for homepage
2009-10-23 13:32:09 -07:00
Scott Main ac1e24ccd6 am 7a0ec6b5: am f963ee63: am 60dba894: docs: add eclair logo for homepage
Merge commit '7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db' into eclair-mr2-plus-aosp

* commit '7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db':
  docs: add eclair logo for homepage
2009-10-23 13:21:18 -07:00