Merge commit '3d2fbef573fca6ae45937ae68fdcffdce5b92e59'
* commit '3d2fbef573fca6ae45937ae68fdcffdce5b92e59':
Make archquery use the same VM as DDMS/Traceview
Merge commit 'f519910b5624f7d7d7a16db482bc205c1b548837' into eclair-plus-aosp
* commit 'f519910b5624f7d7d7a16db482bc205c1b548837':
Fix colSpan for screenshot display from 3 to 4 in DDMS.
Merge commit 'e223b7b371b4d75d2ad5d78713084bde0fe66563'
* commit 'e223b7b371b4d75d2ad5d78713084bde0fe66563':
Make the Density enum use the int value from the api Density enum.
Merge commit '1d448a8f83f78cf48449bb806861224160ff85f9'
* commit '1d448a8f83f78cf48449bb806861224160ff85f9':
Fix the simulator. libhardware now needs a property named "default" to be set to the value "default", otherwise it won't fall back to the default implementation for a module.
Merge commit '68c32ee43e88e19b42caaeddb620a7f2cbf482dd'
* commit '68c32ee43e88e19b42caaeddb620a7f2cbf482dd':
Disable menu items based on device/app selection.
Merge commit '7856a59e6896f0f96f9c01a6a7aaa09579a108f6'
* commit '7856a59e6896f0f96f9c01a6a7aaa09579a108f6':
Create Density based resource values when needed.
Merge commit '09f517d43e73a8a6bc7c7cee96ba1892b58daa0e' into eclair-plus-aosp
* commit '09f517d43e73a8a6bc7c7cee96ba1892b58daa0e':
Add tested.project.dir to classpath for install and debug
Now buildfile recognizes whether targets 'debug' or 'install' are being run for
an ordinary or test project and for the test projects classpath is extended
to enclose the tested project. Tested project is being compiled if necessary.
Merge commit '14ecfe10515807d57ba110671b760024cc5d1af8' into eclair-plus-aosp
* commit '14ecfe10515807d57ba110671b760024cc5d1af8':
Fixed screenshot command line tool to deal with new RawImage
Merge commit 'f9e2be14764832f81a90f1f03ca9460be05191b3' into eclair-plus-aosp
* commit 'f9e2be14764832f81a90f1f03ca9460be05191b3':
Move the screenshot button above the image
Merge commit '5eff99663c35031975b33e25ab74e2a710231c0a' into eclair-plus-aosp
* commit '5eff99663c35031975b33e25ab74e2a710231c0a':
Make archquery use the same VM as DDMS/Traceview
archquery is used to figure out whether the VM is 32 or 64 bit, but on
MacOS X, it used the normal "java" command while the application was
forced to use java 1.5
This could lead to cases where archquery ran in 1.6 64bit but the app
in 1.5 32 bit, creating a mismatch and make the app using the wrong
SWT version.
Merge commit 'b936faf6e6a3e10408f257f948241cf984d7652a' into eclair-plus-aosp
* commit 'b936faf6e6a3e10408f257f948241cf984d7652a':
Disable clipping toggle when not supported.
Merge commit '61676a4061ef0400baa0c75c44a06bf740a55dc6' into eclair-plus-aosp
* commit '61676a4061ef0400baa0c75c44a06bf740a55dc6':
Make the Density enum use the int value from the api Density enum.
This is only supported in Eclair+, so the toggle button
is disable if the edited file is donut or before.
Change-Id: I8bf1f8a8aa3604f269cb226d788c5e1438a5ae0b
This is for both Ant and ADT.
For Ant, also added a check for non-integer values when the platform
is not a preview.
BUG:2118374
Change-Id: Ic8ec533d66a31d9e4b51c9c38b5eaab97bca7414
