Commit graph

997 commits

Author SHA1 Message Date
Dan Bornstein
34ce59147c resolved conflicts for merge of c3d9645e to eclair-mr2 2009-11-17 16:27:02 -08:00
Android (Google) Code Review
c3d9645e29 Merge change I392672f1 into eclair
* changes:
  Add the example test to the CTS.
2009-11-17 15:39:46 -08:00
Dan Bornstein
1347f92e3a Add the example test to the CTS.
Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
2009-11-17 14:27:40 -08:00
Adam Bliss
0774bf3ebd am 580cdbe0: Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2

* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
  Enables nodpi drawables in the framework.
2009-11-16 19:56:34 -08:00
Adam Bliss
580cdbe0fe Enables nodpi drawables in the framework. 2009-11-16 17:18:40 -08:00
Christopher Tate
014b8e0372 am eb71bf7b: Merge change I01d9d733 into eclair
Merge commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b' into eclair-mr2

* commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b':
  Add a host shell function to generate system_server stack traces
2009-11-13 09:08:38 -08:00
Dianne Hackborn
8feaa2b67f am d0b22902: Merge change I847e8ab8 into eclair
Merge commit 'd0b229025792977fe668cd636c7875d954b80b82' into eclair-mr2

* commit 'd0b229025792977fe668cd636c7875d954b80b82':
  Fix issue #2258571: Fix build versions
2009-11-13 09:08:34 -08:00
Xavier Ducrohet
2bfaec8d32 am c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-mr2

* commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
  Add the sdk overlay to the build.
2009-11-13 09:08:30 -08:00
Android (Google) Code Review
eb71bf7b74 Merge change I01d9d733 into eclair
* changes:
  Add a host shell function to generate system_server stack traces
2009-11-12 16:46:35 -08:00
Android (Google) Code Review
d0b2290257 Merge change I847e8ab8 into eclair
* changes:
  Fix issue #2258571: Fix build versions
2009-11-12 16:28:03 -08:00
Android (Google) Code Review
c725b6ee0c Merge change I4d3d08a1 into eclair
* changes:
  Add the sdk overlay to the build.
2009-11-12 16:20:00 -08:00
Dianne Hackborn
f6295cdd82 Fix issue #2258571: Fix build versions
Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
2009-11-12 15:35:35 -08:00
Christopher Tate
744ee8025a Add a host shell function to generate system_server stack traces
For debugging non-ANR weird states in the system server, it is incredibly handy
to be able to force a complete thread-stack dump of that process.  Here's a
shell function that does so (creating the /data/anr/traces.txt file with the
usual permissions if it does not yet exist).

Depends on adb having been configured to run as root.

Change-Id: I01d9d733ef08ffefb00cb61968df36ecf62087f0
2009-11-12 15:33:08 -08:00
Android (Google) Code Review
753846943d Merge change I0c33d697 into eclair-mr2
* changes:
  Clean old DropBoxService.java generated class
2009-11-12 14:10:31 -08:00
Dan Egnor
0c33d697e7 Clean old DropBoxService.java generated class 2009-11-12 11:42:15 -08:00
David 'Digit' Turner
002d1c24b4 am 31597999: Merge change I2edfb71d into eclair
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop
2009-11-11 18:12:06 -08:00
Android (Google) Code Review
31597999a6 Merge change I2edfb71d into eclair
* changes:
  Support secondary CPU ABI in build.prop
2009-11-11 18:08:03 -08:00
Xavier Ducrohet
325b2eb9cb Add the sdk overlay to the build.
Change-Id: I4d3d08a13d23194a84fdd822a130f9aa71bb6360
2009-11-10 17:52:55 -08:00
Android (Google) Code Review
6ef2c3759b Merge change I2bba1884 into eclair-mr2
* changes:
  Clean libwebkit, libjs and libv8 after WebKit merge.
2009-11-10 14:54:04 -08:00
Doug Zongker
d628eacae7 am f17e6387: allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-mr2

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0
2009-11-10 12:33:31 -08:00
Doug Zongker
f17e63879c allow use of unzip version 6.0
Unzip 6.0 changes the name of the fourth column in the "unzip -lv"
output from "Ratio" to "Cmpr".  Allow either name so that
dump-package-stats works with both unzip 5 and unzip 6.
2009-11-09 18:19:48 -08:00
Steve Block
3be0640ad1 Clean libwebkit, libjs and libv8 after WebKit merge.
Change-Id: I2bba18843aa31b849de53e047dceb40de5eccc8a
2009-11-10 02:17:14 +00: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
Xavier Ducrohet
216faf3f1c Add Livewallpapers picker to SDK.
Change-Id: If14c073c13b13bdd042e2a48aa867f4fa2be7572
2009-11-08 15:42:25 -08:00
Xavier Ducrohet
58302409dd Add CertInstaller to the SDK.
Change-Id: I1e680d24080a6514e2dc049d64e570f8cd759dd7
2009-11-06 18:21:32 -08:00
David 'Digit' Turner
2edfb71d01 Support secondary CPU ABI in build.prop
BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.

This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.

TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
2009-11-06 15:12:00 -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
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
5243b109ac WebKit clean required by move of V8 to external/v8.
Change-Id: Idc425e143c928a7da39af9a002705699e3e12901
2009-11-05 07:07:03 +00: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
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
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
d1850e739b Fix incremental build break in openssl. 2009-10-29 13:05:27 -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
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
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