Merge commit 'd06f8e2f4cb97b5a397793ba7b53e62ab73925f8'
* commit 'd06f8e2f4cb97b5a397793ba7b53e62ab73925f8':
Make the ddmlib API use IDevice instead of Device
Merge commit '71f5d130f5d2c512cc811f538b4d0f6613451973'
* commit '71f5d130f5d2c512cc811f538b4d0f6613451973':
Fix an NPE in the New Project Wizard when no test project is specified
First, the ApkBuilder didn't cancel its run if the project had markers from JDT.
Second, the try/catch on ApkBuilder#build didn't properly test the
CoreException status severity (used getCode instead of getSeverity), so it did
not detect cancels being thrown by #abortOnBadSetup and displayed the error
in the console instead.
Merge commit '20d4ecf2d785bb0120222ab4ab249abc1165314c'
* commit '20d4ecf2d785bb0120222ab4ab249abc1165314c':
ADT: remove an obsolete import from the manifest.
Merge commit '770dfc5ed43089228af1892eef3a73a0e7220bc7'
* commit '770dfc5ed43089228af1892eef3a73a0e7220bc7':
ADT: Refactoring classes dealing with android resources out of the editor.
Basically:
editors.resources.manager -> resources.manager
editors.resources.configurations -> resources.configurations
This is to make it less confusing between the "Resources editors" and the
class parsing/handling Android resources (either in a project or in the
framework).
Also moved the ResourceExplorerView out of the resources editors, and clean
up a few other misc classes.
project.*
refactorings.*
Also: moved the export wizard from project.export to wizards.export, moved some
actions out of project into the new internal package actions.
Merge commit 'f12773626484df90e08e5e50bdca81846950218e'
* commit 'f12773626484df90e08e5e50bdca81846950218e':
ADT: Remove StreamHelper and integrate it in AdtPlugin.
StreamHelper was used before by AdtPlugin, DdmsPlugin and EditorsPlugin. It's now
only used by AdtPlugin, so the only 2 methods in it can go in AdtPlugin.
I merged the externalized string in the messages.properties file used by AdtPlugin.
Merge commit '2c83a9f10cc8ac33e1caf411da571e2aa85c0909'
* commit '2c83a9f10cc8ac33e1caf411da571e2aa85c0909':
Update ADT to use the refactored sdklib from previous patch.
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.
