Merge commit '792de31db045e053b154f0e6068f692637f75612'
* commit '792de31db045e053b154f0e6068f692637f75612':
Use the same lock for Sdk class than the one used for loading the SDK.
Merge commit '1d7be8653c61636f56d707f11409fc84ba85d37c'
* commit '1d7be8653c61636f56d707f11409fc84ba85d37c':
Move the custom widgets for avd/targets/apk-config into internal.widgets
Merge commit '48d160dd89a009bfbc30ba3751850a8c4dd96cf6'
* commit '48d160dd89a009bfbc30ba3751850a8c4dd96cf6':
ADT: make sure to log exceptions that might happen when
Merge commit '3c502eb060b578c73df13e63aa748ef00bfe3f76'
* commit '3c502eb060b578c73df13e63aa748ef00bfe3f76':
Misc updates on the Sdklib.
Export all ADT packages.
Merge commit 'ce803ae7b9162f92f43e64922b7d610e652ab468'
* commit 'ce803ae7b9162f92f43e64922b7d610e652ab468':
Update some class names in plugin.xml that were not updated by the refactoring.
Can't reproduce the NPE in ContentAssist listed in the
bug. However if things go really wrong there are a couple
objects that can be null so let's be defensive about them.
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.
