Commit Graph

1148 Commits

Author SHA1 Message Date
Xavier Ducrohet ebbb0d45d7 am 38c09a03: am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit '38c09a03195bbfee94b887ca6b1b8da3d79a4841' into eclair-mr2-plus-aosp

* commit '38c09a03195bbfee94b887ca6b1b8da3d79a4841':
  Add Livewallpapers picker to SDK.
2009-11-09 12:14:45 -08:00
Xavier Ducrohet a6f2b44709 am 07cca294: am 58302409: Add CertInstaller to the SDK.
Merge commit '07cca294a362450a5fc86e372d77503daab11eb1' into eclair-mr2-plus-aosp

* commit '07cca294a362450a5fc86e372d77503daab11eb1':
  Add CertInstaller to the SDK.
2009-11-09 12:14:42 -08:00
Xavier Ducrohet 38c09a0319 am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit '216faf3f1c2c8857ad7e88e860897766c830ce31' into eclair-mr2

* commit '216faf3f1c2c8857ad7e88e860897766c830ce31':
  Add Livewallpapers picker to SDK.
2009-11-09 11:59:56 -08:00
Xavier Ducrohet 07cca294a3 am 58302409: Add CertInstaller to the SDK.
Merge commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a' into eclair-mr2

* commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a':
  Add CertInstaller to the SDK.
2009-11-09 11:59:51 -08:00
Jean-Baptiste Queru e1b710a5ba merge from open-source master 2009-11-09 10:34:27 -08:00
Xavier Ducrohet 216faf3f1c Add Livewallpapers picker to SDK.
Change-Id: If14c073c13b13bdd042e2a48aa867f4fa2be7572
2009-11-08 15:42:25 -08:00
Android Code Review 61a147e3a6 Merge change I6d9c9295
* changes:
  Added a default to specify an alternative tool chain prefix if needed.
2009-11-08 14:17:01 -08:00
Xavier Ducrohet 58302409dd Add CertInstaller to the SDK.
Change-Id: I1e680d24080a6514e2dc049d64e570f8cd759dd7
2009-11-06 18:21:32 -08:00
Mike Reed ebed06a259 am 65a731b7: Merge change I8dd26ee4 into eclair-mr2
Merge commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce' into eclair-mr2-plus-aosp

* commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce':
  remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
2009-11-06 11:24:37 -08:00
Android (Google) Code Review 65a731b737 Merge change I8dd26ee4 into eclair-mr2
* changes:
  remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
2009-11-06 14:16:37 -05:00
akushner ceb18f8923 Added prune options to findleaves.sh to ignore the .git and .repo
directories since the Android.mk files will not be found in these
directories.

Prunning out these directories decreased the make parse by nearly
a minute on a cold cache and eliminated 60,000+ stats on files in
the .git and .repo directories.
2009-11-05 12:49:27 -08:00
Fred Quintana 6f007cf96c am aa82f8ee: am 357f5bc8: Merge change I7397e6fe into eclair
Merge commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707' into eclair-mr2-plus-aosp

* commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707':
  add the new accounts and sync package to the generic target and enable sync for all builds
2009-11-05 11:49:53 -08:00
Fred Quintana aa82f8ee8f am 357f5bc8: Merge change I7397e6fe into eclair
Merge commit '357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-mr2

* commit '357f5bc804fc80f06776e1da141e4b322d7e3248':
  add the new accounts and sync package to the generic target and enable sync for all builds
2009-11-05 11:23:44 -08:00
Android (Google) Code Review 357f5bc804 Merge change I7397e6fe into eclair
* changes:
  add the new accounts and sync package to the generic target and enable sync for all builds
2009-11-05 14:15:58 -05:00
Steve Block 06c3a04ef4 am 5243b109: WebKit clean required by move of V8 to external/v8.
Merge commit '5243b109acec2b03431aef36ccc42256b77ae316' into eclair-mr2-plus-aosp

* commit '5243b109acec2b03431aef36ccc42256b77ae316':
  WebKit clean required by move of V8 to external/v8.
2009-11-04 23:33:28 -08:00
Steve Block 5243b109ac WebKit clean required by move of V8 to external/v8.
Change-Id: Idc425e143c928a7da39af9a002705699e3e12901
2009-11-05 07:07:03 +00:00
Android Code Review 617c402c71 Merge change I377f1f02
* changes:
  Update prelink map for libFLAC
2009-11-04 09:17:13 -08:00
Scott Main 47f77397be am 747f2997: am 24fbbfaa: am 3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '747f2997f1ddeac97090ce1d94d04eed9cffc529' into eclair-mr2-plus-aosp

* commit '747f2997f1ddeac97090ce1d94d04eed9cffc529':
  docs: revise resizing scripts to better organize the
2009-11-03 19:22:34 -08:00
Scott Main 747f2997f1 am 24fbbfaa: am 3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00' into eclair-mr2

* commit '24fbbfaa80ce17481e695c001b66c0176b8f0f00':
  docs: revise resizing scripts to better organize the
2009-11-03 19:12:40 -08:00
Scott Main 24fbbfaa80 am 3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '3f7d1df12938b6db9849b03c05d5a56784ee147b' into eclair

* commit '3f7d1df12938b6db9849b03c05d5a56784ee147b':
  docs: revise resizing scripts to better organize the
2009-11-03 19:04:40 -08:00
Fred Quintana 170e1d59f6 add the new accounts and sync package to the generic target and enable sync for all builds 2009-11-03 16:05:03 -08:00
Scott Main 3f7d1df129 docs: revise resizing scripts to better organize the
tasks into chunks that are only executed when necessary.

Move the stuff that does the reference panel resizing
into a separate method because this should only happen when
literally resizing the panels. This thus resolves the problem
in which an invalid cookie would sometimes be written during
a normal window resize event -- there's no need to write that
cookie unless the user literally resizes the panel.

There's no need to call resizeWidth all the time, the doc-content
div can manage its width by inheritence and should only ever have
to resize its left margin when the side nav is manually resized or
when the page is loaded (in order to account for a saved side nav
width). This vastly improves the performance and visual quality
when resizing. However, IE6 still requires this in order for the scrollbars
to be visible in the content area. So a flag is now set when IE6 is
the browser, it has its own onresize method
and the width is defined only for IE6.

Inside resizeHeight, check what the href path is before doing any
resizing, just to make sure we don't do unecessary work and to
make the code more readable.
2009-11-02 20:06:04 -08:00
Scott Main 034a10891f am 4d3aa886: am ec4194ef: am 64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '4d3aa886dbafcc76e0a5fa6b947a98395beb836e' into eclair-mr2-plus-aosp

* commit '4d3aa886dbafcc76e0a5fa6b947a98395beb836e':
  docs: fix js error when there's no api level cookie saved.
2009-11-02 18:59:08 -08:00
Scott Main 4d3aa886db am ec4194ef: am 64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245' into eclair-mr2

* commit 'ec4194ef1baa2906f916a01e368bb5d6805ba245':
  docs: fix js error when there's no api level cookie saved.
2009-11-02 18:50:09 -08:00
Scott Main ec4194ef1b am 64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '64b879ac5bbabe0489869f76b3a20f26aca6ce22' into eclair

* commit '64b879ac5bbabe0489869f76b3a20f26aca6ce22':
  docs: fix js error when there's no api level cookie saved.
2009-11-02 18:40:23 -08:00
Scott Main 64b879ac5b docs: fix js error when there's no api level cookie saved.
currently, if there's no api level cookie saved, then
the selectedLevelItem variable will be undefined and will
throw an error at the end of the buildApilevelSelector function.
Now, userApiLevel is set to the max level in this case.
2009-11-02 18:05:41 -08:00
Scott Main 8d89f800ce am 3f08740b: am 32b505d9: 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 '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348' into eclair-mr2-plus-aosp

* commit '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348':
  docs: fix IE6 bug in which tabs are not focusable
2009-10-30 15:25:01 -07:00
Scott Main 3f08740b0c am 32b505d9: 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 '32b505d984ed15156b87482f849b865892b57ac2' into eclair-mr2

* commit '32b505d984ed15156b87482f849b865892b57ac2':
  docs: fix IE6 bug in which tabs are not focusable
2009-10-30 15:15:14 -07:00
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 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 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
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
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 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 3fa115999c Bump version to 2.1 API 6.
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
2009-10-26 17:40:19 -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
Scott Main f1bac52fe2 fix search for offline docs. again. 2009-10-26 14:44:48 -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