Merge commit '1bb52f25870a0f183b9c5a24362c2468fb316435'
* commit '1bb52f25870a0f183b9c5a24362c2468fb316435':
Fix ADT junit test for AndroidManifestParser following API change.
We currently hardcode a list in the PlatformTarget and propagate
it to the UI via the AndroidTargetParser. This way we can later
decide to actually get the info from some kind of manifest.
Merge commit 'beb3214b46e18bb461760c47f04c5b909557d060'
* commit 'beb3214b46e18bb461760c47f04c5b909557d060':
ADT #1823896: Ability to add an "extra" action to the AVD Selector.
Used to display the AVD Manager from the Device Chooser/Launch config.
Used to delete AVDs from the AVD Manager.
In AVD Manager, also hide the Cancel button since actions are
immediate and not cancelable.
Merge commit '70fc6e96af1213c192160a16803feb220e10c561'
* commit '70fc6e96af1213c192160a16803feb220e10c561':
Make sure that any exception during the final packaging properly put an error marker on the project (since build failed.
Merge commit '8ffde4bf375063f622a5227c349506cb6721f660'
* commit '8ffde4bf375063f622a5227c349506cb6721f660':
ADT #1820114: Provide a quick UI to edit AVD.
Merge commit '594999277ec269bc706647b23ecc11e16f12a971'
* commit '594999277ec269bc706647b23ecc11e16f12a971':
Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk />
Merge commit 'dc7622dca5bd355d57dd07c332d40b2a16b79bdc'
* commit 'dc7622dca5bd355d57dd07c332d40b2a16b79bdc':
Fix the opt-in window for usage stat so that it works when running from ADT.
Merge commit 'aa8c266ed05c08af71bfdaa48de44bec3d581102'
* commit 'aa8c266ed05c08af71bfdaa48de44bec3d581102':
Split development/.gitignore into separate gitignore files per project.
* changes:
Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk />
This happens when you open the Windows > Prefs > Android panel
while an SDK is initially loading or when you change the
SDK in the pref panel. The target change listener was not
properly removed since the field was not properly disposed.
This also removed the multiple selection handling in the
SdkTargetSelector, which we never use. In the unlikely event
we want to use it later, it would be trivial to add it back.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146638
For ADT #1603194, it is desirable to select the Instrumentation
Runner class from the android.jar. The class browser was filtering
it out. The class browser has been changed like this:
- include all source & jar package roots
- a checkbox let the user toggle between searching only sources
(of the project) or anything in the classpath (thus include jars.)
The default is to include everything for the instrumentation and only
the source for other browsers.
Also improved a bit the filter by not iterating over the hierarchy
and filtering out abstract classes (which was not needed before.)
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146570
The fix I did last week was just refreshing the UiRootNode
but it turns out we need to refresh the DescriptorFilters too
(since they are null when there's no SDK.) So the old fix was
wrong, what we need is to generate a new tree model when the
SDK is reloaded.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146555
