OSDN Git Service
Raphael Moll [Sat, 27 Feb 2010 00:38:46 +0000 (16:38 -0800)]
Merge "ADT GLE2: Support for drop on RelativeLayout children."
Raphael [Sat, 27 Feb 2010 00:11:05 +0000 (16:11 -0800)]
ADT GLE2: Support for drop on RelativeLayout children.
Change-Id: I6ed9f1d89f61caf6141f23708854a01247ab5518
Xavier Ducrohet [Fri, 26 Feb 2010 00:30:25 +0000 (16:30 -0800)]
ADT: clean up implementation of listeners here and there.
Use delegate instead of main class so that listener callbacks
are not part of the class API.
Change-Id: I917c17c3b3d7ae3f125834d773f041b5b57b8c3f
Xavier Ducrohet [Thu, 25 Feb 2010 23:28:28 +0000 (15:28 -0800)]
Add a delta visitor for the library projects.
This is used by the precompiler to trigger recompilation
of the resource (generates R.java) and by the ApkBuilder
to trigger resource packaging.
Change-Id: I3a18817a50aa2cdbbd3745a2bba0fda2adbf8556
Xavier Ducrohet [Thu, 25 Feb 2010 19:38:55 +0000 (11:38 -0800)]
Merge "ADT: Apkbuilder now adds the library resources to the apk."
Xavier Ducrohet [Thu, 25 Feb 2010 19:38:18 +0000 (11:38 -0800)]
Merge "Fix project creation by properly creating default.properties if needed."
Xavier Ducrohet [Thu, 25 Feb 2010 19:38:06 +0000 (11:38 -0800)]
Merge "detect too recent version of the ant rules and display an error."
Raphael Moll [Thu, 25 Feb 2010 05:09:00 +0000 (21:09 -0800)]
Merge "ADT GLE2: Support zoom and scrollbar in canvas."
Xavier Ducrohet [Thu, 25 Feb 2010 03:02:50 +0000 (19:02 -0800)]
ADT: Apkbuilder now adds the library resources to the apk.
Change-Id: Ic29acc53605bd580bfef44278b6997acff76e849
Xavier Ducrohet [Thu, 25 Feb 2010 00:22:07 +0000 (16:22 -0800)]
detect too recent version of the ant rules and display an error.
This is to solve the case where a user somehow update a platform
component but not the tools. the custom Ant tasks will detect
the revision of the ant rules and fail if it's too recent.
Change-Id: Ica91a500ca980f9ed5f3a7c4fb09b85a63b8037b
Xavier Ducrohet [Thu, 25 Feb 2010 00:51:35 +0000 (16:51 -0800)]
Move sdklib.internal.io.* into sdklib.io
Some other "public" API (AndroidManifest) depends on it
so it should be public too.
Change-Id: I88cd299bbd60df8f4dac5fe029bb52c0c0c2f16c
Xavier Ducrohet [Wed, 24 Feb 2010 22:41:30 +0000 (14:41 -0800)]
Fix project creation by properly creating default.properties if needed.
This was broken by the commit that introduced ProjectState.
Also fixed issue when default.properties was changed outside of Eclipse.
ADT now properly reload it content and re-resolve the target.
Change-Id: I7866feee626e8e22bdb37638eed1aca03c934382
Raphael [Wed, 24 Feb 2010 22:16:07 +0000 (14:16 -0800)]
ADT GLE2: Support zoom and scrollbar in canvas.
Change-Id: I98442be1d01cff0227244c4e1d346b8642106a79
Xavier Ducrohet [Wed, 24 Feb 2010 20:56:52 +0000 (12:56 -0800)]
Merge "Fix build of the plugin: builders project is gone."
Xavier Ducrohet [Wed, 24 Feb 2010 20:56:12 +0000 (12:56 -0800)]
Fix build of the plugin: builders project is gone.
Change-Id: If128a3feb42f2b680a3d155180bdc58096183a8b
Xavier Ducrohet [Wed, 24 Feb 2010 19:45:09 +0000 (11:45 -0800)]
Merge work related to library projects from sdk-dev to
Change-Id: Id68032067ab4e983296909a0b2536acaca08371d
The Android Open Source Project [Wed, 24 Feb 2010 19:18:41 +0000 (11:18 -0800)]
The Android Open Source Project [Wed, 24 Feb 2010 17:56:49 +0000 (09:56 -0800)]
merge from open-source master
The Android Open Source Project [Wed, 24 Feb 2010 17:41:10 +0000 (09:41 -0800)]
snapshot
Xavier Ducrohet [Wed, 24 Feb 2010 04:31:43 +0000 (20:31 -0800)]
Improve the IAbstractFile/Folder classes.
- Add setContent to the file class
- add listMembers to the folder class
- extend java.io.File instead of using a delegate.
Change-Id: Ib6434b37c8cceb6661bc6a17ae678a56d2c243f2
Xavier Ducrohet [Wed, 24 Feb 2010 01:51:46 +0000 (17:51 -0800)]
Merge remote branch 'goog/master' into HEAD
Xavier Ducrohet [Fri, 19 Feb 2010 03:52:14 +0000 (19:52 -0800)]
ADT: Library support: source folder and pre-compiler.
This is the first step in the library support.
For each library, create a source folder in the main project that
is linked to the source folder of the library project.
The linked resources use a path variable named after the library
in the format: _android_<library name>.
These variables are always created when the link is created.
For now the link is recreated all the time, but we could
do a check and not redo it if it's already done.
Additionally, the pre-compiler creates the R class from
the res folders of the main and library projects.
Some misc fixes/clean-ups:
* Fix an issue with the new ProjectState where opening a
project would not trigger a load of its target data.
* Changed the lock for all SDK operation:
- moved the lock in Sdk accessible as Sdk.getLock()
- made the few Sdk method that used their own synchronize
block use the same lock as all others.
* removed the builders project and moved its content to sdklib
This was meant as a way to share code between the Eclipse
builders and the Ant tasks but sdklib is already used by
both, so it's better to put the code in sdklib than
have yet another project.
Change-Id: Ibfa449c7a809f28e428c03bbda8215969717ecde
Xavier Ducrohet [Wed, 24 Feb 2010 00:05:10 +0000 (16:05 -0800)]
Only add gdbserver to the APK if the manifest has debuggable to true.
Change-Id: I2411f59f46cdda2e12b1627d450cde6c9cd109d8
Raphael [Tue, 23 Feb 2010 05:54:18 +0000 (21:54 -0800)]
ADT GLE: fix scrollbar in palette composite.
Change-Id: Ic9bd947b7b6b52f69f6eab9c4d38e63557b23c70
Raphael [Mon, 22 Feb 2010 22:23:00 +0000 (14:23 -0800)]
ADT GLE: Experiment with d'n'd in RelativeLayout.
Change-Id: Ic737d5273b55a4ec78c1d9789616e1e296b77b00
Xavier Ducrohet [Mon, 22 Feb 2010 19:31:13 +0000 (11:31 -0800)]
Merge "Prevent AVD Manager in ADT from forcing reload of the targets."
Xavier Ducrohet [Sat, 20 Feb 2010 01:44:39 +0000 (17:44 -0800)]
Prevent AVD Manager in ADT from forcing reload of the targets.
When the AVD Manager launches, it would notify some listener
that the SDK is changed. This was because it used the SDK Changed
event as a way to initialize the pages.
In ADT, an extra listener actually reload the SDK manager
inside ADT when that event triggers, making the SDK also
reload when the AVD Manager window is opened.
The fix is to add a flag to the listener interface to
distinguish initial load and actual SDK change.
Change-Id: I395dc305fa0d698889cdbd7bb7db7d540dde568b
Raphael [Fri, 19 Feb 2010 05:47:52 +0000 (21:47 -0800)]
ADT GLE: experiment with display of Relative layout params.
Change-Id: Icd8ac13e91b575c7133c5c0256a46e3c16e5fae8
Xavier Ducrohet [Fri, 19 Feb 2010 00:30:41 +0000 (16:30 -0800)]
Clean up for how the ADT plug-in keeps track of project and their targets.
For some the (IProject, IAndroidTarget) map was only filled when a project
was created or had its target changed. Other projects that were just opened
in the workspace wouldn't be put in the map, making each call to Sdk.getTarget()
read the default.properties.
This commit adds a new class ProjectState to centralize the state of a project
including target info, apk settings and soon libraries.
The project state are stored statically in Sdk so that they survive Sdk reload.
I'm cleaning up the API of Sdk also to make it let complex and weird.
Change-Id: I1324c622a646486a474ce26b2172385f00091b3f
Raphael [Thu, 18 Feb 2010 06:30:03 +0000 (22:30 -0800)]
ADT GLE: new IViewRule interface for Drag'n'drop.
With implementation for AbsoluteLayout and LinearLayout.
Change-Id: If8d6301abcc848574b3ab5d8894396a0246b1275
Xavier Ducrohet [Wed, 17 Feb 2010 01:42:42 +0000 (17:42 -0800)]
Change the property names to something better.
Once added to the rest of the properties, "revision.*" is a bit
to vague.
Change-Id: Ifaca600ac3a5c6de35aa6bd1465a0a3fc2ccde52
Xavier Ducrohet [Wed, 17 Feb 2010 01:55:41 +0000 (17:55 -0800)]
Check whether the project's target supports libraries.
Check is done when:
- a library is added to a project through "android update project"
- a project is compiled through Ant
Change-Id: I09993b9aac5ad32a84335647429fc52fa2babaf9
Xavier Ducrohet [Wed, 17 Feb 2010 01:42:42 +0000 (17:42 -0800)]
Change the property names to something better.
Once added to the rest of the properties, "revision.*" is a bit
to vague.
Change-Id: I386780f3bd3b39ef6ea49d1c8d3c717cb263b6a1
Xavier Ducrohet [Wed, 17 Feb 2010 00:05:20 +0000 (16:05 -0800)]
Merge remote branch 'goog/master' into HEAD
Xavier Ducrohet [Tue, 16 Feb 2010 23:25:39 +0000 (15:25 -0800)]
Add Ant build/template revision to the SDK platforms.
Change-Id: I1cd3964707c5472851c6868796649e62b4f2d232
Raphael Moll [Sat, 13 Feb 2010 05:07:51 +0000 (21:07 -0800)]
Merge "ADT GRE: Resolve gscripts groovy imports."
Xavier Ducrohet [Sat, 13 Feb 2010 03:24:51 +0000 (19:24 -0800)]
Fix the build for good this time.
MANIFEST.MF had a bad conflict resolution.
Xavier Ducrohet [Sat, 13 Feb 2010 02:43:06 +0000 (18:43 -0800)]
Merge "Fix Eclipse ADT build."
Xavier Ducrohet [Sat, 13 Feb 2010 02:41:38 +0000 (18:41 -0800)]
Fix Eclipse ADT build.
Xavier Ducrohet [Sat, 13 Feb 2010 01:23:36 +0000 (17:23 -0800)]
Merge remote branch 'goog/master' into HEAD
Conflicts:
eclipse/plugins/com.android.ide.eclipse.adt/.classpath
eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
eclipse/plugins/com.android.ide.eclipse.adt/build.properties
eclipse/plugins/com.android.ide.eclipse.tests/.classpath
Change-Id: I4013ba2d22e5b602329534ff602c7a7e7ce38567
Xavier Ducrohet [Fri, 12 Feb 2010 22:13:02 +0000 (14:13 -0800)]
New "builders" project for common code to Eclipse and Ant.
This new project will contain build specific code used by both
the custom Ant tasks and the Eclipse builders.
The first code to go in there, is the IAbstractFile/Folder classes
already used by Eclipse as an abstraction layer for file/folder
access when some code needs to use both the Java IO API and the
Eclipse resources API.
The builders project include the implementation for the Java IO,
while the Eclipse implementation is in ADT.
Xavier Ducrohet [Fri, 12 Feb 2010 22:13:02 +0000 (14:13 -0800)]
New "builders" project for common code to Eclipse and Ant.
This new project will contain build specific code used by both
the custom Ant tasks and the Eclipse builders.
The first code to go in there, is the IAbstractFile/Folder classes
already used by Eclipse as an abstraction layer for file/folder
access when some code needs to use both the Java IO API and the
Eclipse resources API.
The builders project include the implementation for the Java IO,
while the Eclipse implementation is in ADT.
Change-Id: I93d07117678000531bd17540b1ccddca8edb86ad
Raphael [Wed, 10 Feb 2010 18:40:16 +0000 (10:40 -0800)]
ADT GRE: Resolve gscripts groovy imports.
This reconfigures the Groovy engine:
- The user projects /gscripts folder is added to the groovy class path
(so user can import their own local classes.)
- The IViewRule package is added as a default import (using the
import .* syntax), which means the scripts don't have the specify
every single import anymore.
- Our scripts can now extend each others -- as long as the classes are
in our package they will be resolved and loaded.
Change-Id: I79dabf7d1317a1bf4a0fc04ee8ba0987dca7da15
Xavier Ducrohet [Thu, 11 Feb 2010 23:02:48 +0000 (15:02 -0800)]
Add support for creating/updating library project to the "android" command-line tool.
Also, support to add a reference to a library from a regular project.
Bug:
2294012
Change-Id: I5323dd5816426651a1e77ab206d9d17ee5749813
Raphael [Wed, 10 Feb 2010 23:25:57 +0000 (15:25 -0800)]
Update prebuilt Groovy JAR to 1.7.0
Depends on Change Ie2684212
Change-Id: I3c269c7e972b8fcb207409732c450fab1544b508
Xavier Ducrohet [Thu, 11 Feb 2010 00:43:50 +0000 (16:43 -0800)]
Merge remote branch 'goog/master' into HEAD
Xavier Ducrohet [Wed, 10 Feb 2010 23:22:11 +0000 (15:22 -0800)]
Add support for external jar files in library project.
Bug:
2294012
Change-Id: I88bc99d9c3ac4135aac4c5af7995aca25bf5c4ee
Xavier Ducrohet [Wed, 10 Feb 2010 18:34:20 +0000 (10:34 -0800)]
Merge "Add support for library project in the Ant build system." into sdk-dev
Xavier Ducrohet [Wed, 3 Feb 2010 19:52:04 +0000 (11:52 -0800)]
Add support for library project in the Ant build system.
new build rules file for library only. Should probably extract
the parts that are common to this and the default rules file.
SetupTask now sets up some properties and Path reference based
on the libraries.
They are used by:
- aapt task (now also used for the generation of R.java) which
use all the res folders of the main project and the libraries,
and generate an R class for the project and the libraries.
- javac which compiles the src/ folders of the libraries.
Bug:
2294012
Change-Id: Ie550dcf0ba8ea57696ebb1c2a61d4c6d73307bdf
Raphael [Tue, 9 Feb 2010 20:31:51 +0000 (12:31 -0800)]
ADT GLE2: Implement IViewRule.onChildSelected.
Revamp the IViewRule.on[Child]Selected to not return a closure.
There is no actual event at selection time.
Instead the callback is called directly to paint the canvas.
Change-Id: I2b50fbdff734b9c1a2c581ca5958bac43e5f325f
Raphael [Mon, 8 Feb 2010 23:26:41 +0000 (15:26 -0800)]
ADT GLE2: support isMultipleSelection.
Problem is easily solved by making this a parameter
in the closure, so we don't need to ask rules to give
us a different closure, they just need to redraw.
Change-Id: I4445c826b03bbb978bf085905ccd67d5e03b0356
Raphael [Mon, 8 Feb 2010 22:18:20 +0000 (14:18 -0800)]
ADT GLE2: Rename IGC to IGraphics.
This is a pure rename refatoring.
Change-Id: Iffddb02b4c1efd553a0ba866a58a8059c290a7b7
Raphael Moll [Mon, 8 Feb 2010 22:11:42 +0000 (14:11 -0800)]
Merge "GLE2: IViewRule callback for selection."
Raphael [Thu, 4 Feb 2010 23:08:46 +0000 (15:08 -0800)]
GLE2: IViewRule callback for selection.
Details:
- This moves the selection drawing from the LayoutCanvas to
the groovy script.
- There's a single IViewRule "onSelected" method. The script
which implement it return a closure (aka an anonymous method)
that does the actual drawing.
- onSelected is called during the actualy selection or when
the canvas is refreshed. The rendering closure is actually called
later during the canvas onPaint.
Here I am mostly testing the logic of having a script callback
handle an event (the selection) and returning a closure that
does the drawing later (during onpaint).
The main rationale for separating them is that the GC needed to
draw isn't available during the actual selection event.
I plan to reuse this mechanism for drag'n'drop & co.
TODO: layout selection is broken and will be fixed in another CL.
TODO: onChildSelected will be next.
TODO: Originally I had plans for onSelected(isMultipleSelection),
which I'm not sure I'll actually add later anyway., I fail to
see the point in implementation.
Change-Id: Ibc5fecbd107429df1f53b2b8172aba55e6289795
The Android Open Source Project [Fri, 5 Feb 2010 22:22:09 +0000 (14:22 -0800)]
am
2e5401ff: am
b7deec25: reconcile main tree with open-source eclair
Merge commit '
2e5401ff6a2fcd6978adf1d2895935a42e1990bf'
* commit '
2e5401ff6a2fcd6978adf1d2895935a42e1990bf':
android-2.1_r1 snapshot
Xavier Ducrohet [Fri, 5 Feb 2010 21:59:29 +0000 (13:59 -0800)]
Merge "Differentiate between invalid and broken AVDs."
Xavier Ducrohet [Fri, 5 Feb 2010 21:29:14 +0000 (13:29 -0800)]
Differentiate between invalid and broken AVDs.
Change-Id: I3dea9e0542dbc5eb2c33285b5c992f896f3d871b
The Android Open Source Project [Fri, 5 Feb 2010 16:48:08 +0000 (08:48 -0800)]
am
b7deec25: reconcile main tree with open-source eclair
Merge commit '
b7deec2514dfa9b0c8a67df340023f16c8ef0f7a' into eclair-plus-aosp
* commit '
b7deec2514dfa9b0c8a67df340023f16c8ef0f7a':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:42 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Raphael [Thu, 4 Feb 2010 23:13:38 +0000 (15:13 -0800)]
ADT NPW: Fix dialog title for New Android Test Project
SDK Bug:
2420637
Change-Id: I321cb49ecf1e11f0619c769c211338c55552d108
Raphael [Wed, 3 Feb 2010 23:45:10 +0000 (15:45 -0800)]
Windows SDK create bridge doesn't need to request layoutlib.jar
Change-Id: Icaa3cb2367ac57041ba5bb7df787ee51374fd0b8
Xavier Ducrohet [Wed, 3 Feb 2010 19:46:53 +0000 (11:46 -0800)]
am
bd213eb2: am
5a99e2a9: Merge "Fix sorting of Sample-type packages" into eclair
Merge commit '
bd213eb273952e1c1bb05fc4f07422e923b526f2'
* commit '
bd213eb273952e1c1bb05fc4f07422e923b526f2':
Fix sorting of Sample-type packages
Xavier Ducrohet [Wed, 3 Feb 2010 19:43:57 +0000 (11:43 -0800)]
am
5a99e2a9: Merge "Fix sorting of Sample-type packages" into eclair
Merge commit '
5a99e2a96fe013562a71b222dc596f47045650c6' into eclair-plus-aosp
* commit '
5a99e2a96fe013562a71b222dc596f47045650c6':
Fix sorting of Sample-type packages
Xavier Ducrohet [Wed, 3 Feb 2010 19:40:58 +0000 (11:40 -0800)]
Merge "Fix sorting of Sample-type packages" into eclair
Xavier Ducrohet [Wed, 3 Feb 2010 07:09:36 +0000 (23:09 -0800)]
am
a384f42a: am
61c0fc73: Merge "Fixed feature icon and plug-ins exported package lists." into eclair
Merge commit '
a384f42a37f84c1b50774b68bdea5ddd94bc8777'
* commit '
a384f42a37f84c1b50774b68bdea5ddd94bc8777':
Fixed feature icon and plug-ins exported package lists.
Xavier Ducrohet [Wed, 3 Feb 2010 07:09:33 +0000 (23:09 -0800)]
Xavier Ducrohet [Wed, 3 Feb 2010 04:57:37 +0000 (20:57 -0800)]
am
61c0fc73: Merge "Fixed feature icon and plug-ins exported package lists." into eclair
Merge commit '
61c0fc7326396fbb01a8de5156ced61a2336ed9d' into eclair-plus-aosp
* commit '
61c0fc7326396fbb01a8de5156ced61a2336ed9d':
Fixed feature icon and plug-ins exported package lists.
Xavier Ducrohet [Wed, 3 Feb 2010 04:57:34 +0000 (20:57 -0800)]
am
aac1ef57: Update SDK change log.
Merge commit '
aac1ef57789bb85432aa104832815c818a9acde6' into eclair-plus-aosp
* commit '
aac1ef57789bb85432aa104832815c818a9acde6':
Update SDK change log.
Xavier Ducrohet [Wed, 3 Feb 2010 01:10:17 +0000 (17:10 -0800)]
Merge "Fixed feature icon and plug-ins exported package lists." into eclair
Xavier Ducrohet [Wed, 3 Feb 2010 01:03:36 +0000 (17:03 -0800)]
Fixed feature icon and plug-ins exported package lists.
Change-Id: Ie5de78e8546baa2a7ed16fc0cd8278b6553ee6a1
Xavier Ducrohet [Wed, 3 Feb 2010 00:12:04 +0000 (16:12 -0800)]
Fix sorting of Sample-type packages
Also sort the list of local packages.
Bug:
2414760
Change-Id: I0a25d5985db76d561bd312682ac1ce31eafaf560
Xavier Ducrohet [Wed, 3 Feb 2010 00:22:17 +0000 (16:22 -0800)]
am
987c9e13: am
8b02c04f: Merge "ADT: Refreshed some icons." into eclair
Merge commit '
987c9e13fd436ad68031ddae84598d5e67069298'
* commit '
987c9e13fd436ad68031ddae84598d5e67069298':
ADT: Refreshed some icons.
Xavier Ducrohet [Wed, 3 Feb 2010 00:22:14 +0000 (16:22 -0800)]
am
6eb8f849: (-s ours) am
3b9b9b56: Add support for VMs that can stream hprof data through JDWP. Do not merge
Merge commit '
6eb8f849f3711d523c84655914ee360018804b7f'
* commit '
6eb8f849f3711d523c84655914ee360018804b7f':
Add support for VMs that can stream hprof data through JDWP. Do not merge
Xavier Ducrohet [Tue, 2 Feb 2010 22:21:23 +0000 (14:21 -0800)]
am
8b02c04f: Merge "ADT: Refreshed some icons." into eclair
Merge commit '
8b02c04fa9ad496c6b46ae98496615c85656a489' into eclair-plus-aosp
* commit '
8b02c04fa9ad496c6b46ae98496615c85656a489':
ADT: Refreshed some icons.
Xavier Ducrohet [Tue, 2 Feb 2010 22:21:19 +0000 (14:21 -0800)]
am
3b9b9b56: Add support for VMs that can stream hprof data through JDWP. Do not merge
Merge commit '
3b9b9b5678aa54cc82621a8563079fc13d5fa8e4' into eclair-plus-aosp
* commit '
3b9b9b5678aa54cc82621a8563079fc13d5fa8e4':
Add support for VMs that can stream hprof data through JDWP. Do not merge
Xavier Ducrohet [Tue, 2 Feb 2010 21:34:18 +0000 (13:34 -0800)]
Update SDK change log.
Change-Id: I3c033f68f79845085cf64daa44ff273c4a52a3d1
Xavier Ducrohet [Tue, 2 Feb 2010 21:06:42 +0000 (13:06 -0800)]
Merge "ADT: Refreshed some icons." into eclair
Xavier Ducrohet [Tue, 2 Feb 2010 00:32:57 +0000 (16:32 -0800)]
ADT: Refreshed some icons.
Getting rid of the goldish round icon with the a inside as it's not
used anywhere on android.com
Change-Id: I7ea0e4de1df973baedc41c2a1ca8918f51c25f75
Xavier Ducrohet [Sat, 30 Jan 2010 02:11:14 +0000 (18:11 -0800)]
Add support for VMs that can stream hprof data through JDWP. Do not merge
Integrated from master for inclusion in the SDK Tools r5
Change-Id: Ifad984f5b0ae187428cb7d871b039dddf0db4ba7
Raphael Moll [Tue, 2 Feb 2010 17:38:21 +0000 (09:38 -0800)]
am
e9084525: am
8406d9b8: Merge "SDK Manager: apply settings instantaneously." into eclair
Merge commit '
e9084525a0d2c01c77b0135277b9478a3c34f4ce'
* commit '
e9084525a0d2c01c77b0135277b9478a3c34f4ce':
SDK Manager: apply settings instantaneously.
Xavier Ducrohet [Tue, 2 Feb 2010 17:38:17 +0000 (09:38 -0800)]
am
b4e91253: (-s ours) am
d9c0fde0: Merge "Strawman support for streaming hprof dumps. Do not merge" into eclair
Merge commit '
b4e9125365d975626cb0d6fdb3ea29f26c0f6861'
* commit '
b4e9125365d975626cb0d6fdb3ea29f26c0f6861':
Strawman support for streaming hprof dumps. Do not merge
Xavier Ducrohet [Tue, 2 Feb 2010 17:38:11 +0000 (09:38 -0800)]
am
8b17f918: am
232ddc3c: Merge "Fix \'android create test-project\' to handle parent projects with missing default.prop" into eclair
Merge commit '
8b17f918e5fbfd52f9c4c16a59b011f2c85e8f0a'
* commit '
8b17f918e5fbfd52f9c4c16a59b011f2c85e8f0a':
Fix 'android create test-project' to handle parent projects with missing default.prop
Raphael [Tue, 2 Feb 2010 17:38:07 +0000 (09:38 -0800)]
am
be69e620: am
9783ea31: SDK Manager: fix android.bat to correctly work on 64bit JVMs.
Merge commit '
be69e620db2081c1c559458aff24080f30596e20'
* commit '
be69e620db2081c1c559458aff24080f30596e20':
SDK Manager: fix android.bat to correctly work on 64bit JVMs.
Raphael [Tue, 2 Feb 2010 17:38:00 +0000 (09:38 -0800)]
am
4ae8aec6: am
0b9f1ace: SDK Updater: ask for confirmation before wiping modified samples.
Merge commit '
4ae8aec6c7ecc1117cc6e3a3584dab0e5aff8a98'
* commit '
4ae8aec6c7ecc1117cc6e3a3584dab0e5aff8a98':
SDK Updater: ask for confirmation before wiping modified samples.
Raphael Moll [Tue, 2 Feb 2010 03:01:41 +0000 (19:01 -0800)]
am
8406d9b8: Merge "SDK Manager: apply settings instantaneously." into eclair
Merge commit '
8406d9b88bccec370d3e9a208e0f1e3990772ddb' into eclair-plus-aosp
* commit '
8406d9b88bccec370d3e9a208e0f1e3990772ddb':
SDK Manager: apply settings instantaneously.
Raphael Moll [Tue, 2 Feb 2010 02:57:48 +0000 (18:57 -0800)]
Merge "SDK Manager: apply settings instantaneously." into eclair
Raphael [Tue, 2 Feb 2010 02:15:05 +0000 (18:15 -0800)]
SDK Manager: apply settings instantaneously.
SDK Bug:
2411665
Change-Id: I6d4a38f4f2d974a727d8e0891d63618d82c578ad
Xavier Ducrohet [Tue, 2 Feb 2010 02:10:39 +0000 (18:10 -0800)]
am
d9c0fde0: Merge "Strawman support for streaming hprof dumps. Do not merge" into eclair
Merge commit '
d9c0fde00d1cc01abbff3e7f61a6fdb59807c5c9' into eclair-plus-aosp
* commit '
d9c0fde00d1cc01abbff3e7f61a6fdb59807c5c9':
Strawman support for streaming hprof dumps. Do not merge
Xavier Ducrohet [Tue, 2 Feb 2010 02:06:40 +0000 (18:06 -0800)]
Merge "Strawman support for streaming hprof dumps. Do not merge" into eclair
Xavier Ducrohet [Mon, 1 Feb 2010 23:48:39 +0000 (15:48 -0800)]
am
232ddc3c: Merge "Fix \'android create test-project\' to handle parent projects with missing default.prop" into eclair
Merge commit '
232ddc3cc681f1e40b98fb8abc8be25beb509245' into eclair-plus-aosp
* commit '
232ddc3cc681f1e40b98fb8abc8be25beb509245':
Fix 'android create test-project' to handle parent projects with missing default.prop
Xavier Ducrohet [Mon, 1 Feb 2010 23:43:47 +0000 (15:43 -0800)]
Merge "Fix 'android create test-project' to handle parent projects with missing default.prop" into eclair
Raphael [Mon, 1 Feb 2010 23:35:51 +0000 (15:35 -0800)]
am
9783ea31: SDK Manager: fix android.bat to correctly work on 64bit JVMs.
Merge commit '
9783ea31375cff1954190ff5bddfba880f2da02b' into eclair-plus-aosp
* commit '
9783ea31375cff1954190ff5bddfba880f2da02b':
SDK Manager: fix android.bat to correctly work on 64bit JVMs.
Raphael [Mon, 1 Feb 2010 23:35:48 +0000 (15:35 -0800)]
am
0b9f1ace: SDK Updater: ask for confirmation before wiping modified samples.
Merge commit '
0b9f1ace93062a769c6ed2a963d7f3e9d839cb22' into eclair-plus-aosp
* commit '
0b9f1ace93062a769c6ed2a963d7f3e9d839cb22':
SDK Updater: ask for confirmation before wiping modified samples.
Xavier Ducrohet [Mon, 1 Feb 2010 23:12:56 +0000 (15:12 -0800)]
Fix 'android create test-project' to handle parent projects with missing default.prop
Bug:
2411562
Change-Id: Ia22491d56dfa3c5dda700782c28a2bcbfeebd266
Raphael [Mon, 1 Feb 2010 21:39:41 +0000 (13:39 -0800)]
SDK Manager: fix android.bat to correctly work on 64bit JVMs.
SDK Bug: http://b.android.com/3917
Change-Id: I4a72a3c16ddeb9ab331342de7a72cc5ae61e8cdc
Raphael [Sat, 30 Jan 2010 06:25:55 +0000 (22:25 -0800)]
SDK Updater: ask for confirmation before wiping modified samples.
SDK Bug:
2401466
Change-Id: I09d596b44b3daf3a079c51f76db3f9f8d376a8b3
Xavier Ducrohet [Sat, 30 Jan 2010 02:11:14 +0000 (18:11 -0800)]
Add support for VMs that can stream hprof data through JDWP.
Change-Id: I0fcc8718685ddb7accd459e78821677f044135ba
Xavier Ducrohet [Sat, 30 Jan 2010 01:57:44 +0000 (17:57 -0800)]
am
db173b4b: am
f89bdfe5: Fix https download for the standalone version of the SDK Updater
Merge commit '
db173b4b6618c7cec316214cc3b4fba277ad4112'
* commit '
db173b4b6618c7cec316214cc3b4fba277ad4112':
Fix https download for the standalone version of the SDK Updater
Xavier Ducrohet [Sat, 30 Jan 2010 01:54:44 +0000 (17:54 -0800)]
am
f89bdfe5: Fix https download for the standalone version of the SDK Updater
Merge commit '
f89bdfe5b20157a284bf374d4d2e067e3ae2b9d8' into eclair-plus-aosp
* commit '
f89bdfe5b20157a284bf374d4d2e067e3ae2b9d8':
Fix https download for the standalone version of the SDK Updater
Xavier Ducrohet [Fri, 29 Jan 2010 21:53:40 +0000 (13:53 -0800)]
Fix https download for the standalone version of the SDK Updater
The problem was due to the launch script completely replacing
java.ext.dirs preventing the VM from accessing the optional
jce.jar package (Java Cryptography Extension).
The launch script now queries the JVM for the current value
of java.ext.dirs (using archquery) to append to it instead
of replacing it.
In order to do that, archquery.jar now outputs only the value
of the queried system property instead of output "name=value"
Bug:
2248892
Change-Id: If17d48e46529bebc1a25daf99f2748e9ec81a214