Merge commit '846c7d8b2ee81da0c0905bd51f32065d2ebf7ef2'
* commit '846c7d8b2ee81da0c0905bd51f32065d2ebf7ef2':
ADT GLE: change error display to a separate sash.
Merge commit 'b1e9793d6620ef973552f4d8672578f1276d68c2' into eclair-plus-aosp
* commit 'b1e9793d6620ef973552f4d8672578f1276d68c2':
ADT GLE: change error display to a separate sash.
This allows GEP to display both the latest error and the latest
successful rendering. The error still needs an icon and the
canvas will need to be grayed or something.
Also the LayoutCanvas will directly use the ILayoutResult and we
won't need to custom EditData in UiElementNode so the correspond
method is @deprecated (but obviously still supported for GLE1.)
Change-Id: Ia3afed836755dbd84a4511eaed0782c85a383ac9
Merge commit '9f742986117baf8d365b8938baec57ccf499041a'
* commit '9f742986117baf8d365b8938baec57ccf499041a':
Add backslashes before apostrophes so they don't get lost.
Merge commit '0c12e21a3152b62fb330c86b5ea544e927300608' into eclair-plus-aosp
* commit '0c12e21a3152b62fb330c86b5ea544e927300608':
Add backslashes before apostrophes so they don't get lost.
This uses the (new in cupcake) VM command through JDWP.
Older VMs are detected through the (also new) 'FEAT' command that notifies
which features the VM supports.
The hprof file is right now saved in /sdcard. Due to donut+ apps not having
the SD Card permission by default, we may need to change this in the (near)
future.
Upon completion of the dump by the VM, DDMS will give the user a file selector
to choose a place to save the file on the host machine.
Future improvements: run (our own) hat, or hprof-conv and a standard hprof
tool (Eclipse MAT integration for instance). This should be configurable
by the user.
Change-Id: I33696b0263e3d0788ad5d90cedf3cd17393d2f9b
Merge commit '8899d822de7b51368fc7ce4c158a7265e3eccbb3'
* commit '8899d822de7b51368fc7ce4c158a7265e3eccbb3':
Update apkbuilder to support new property names
Merge commit '56098693d29346fc3bf995a125e12fb2d3e1523d' into eclair-plus-aosp
* commit '56098693d29346fc3bf995a125e12fb2d3e1523d':
Update apkbuilder to support new property names
This is required by another change I am about to submit that makes it
an error not to include the backslash, since it is inevitably a mistake
when someone fails to include it.
Merge commit '3ea427ad1fe7c7b4eae2a0b64a6ea8342e143ff3'
* commit '3ea427ad1fe7c7b4eae2a0b64a6ea8342e143ff3':
ADT: change continuous test ant script to run both functional and unit tests.
Merge commit '6ef45eb862a8eb0f03fbd6b1c915ec03fc28f1e9' into eclair-plus-aosp
* commit '6ef45eb862a8eb0f03fbd6b1c915ec03fc28f1e9':
DDMS now queries the VM for its features.
Merge commit 'b8b984d0776ad0f34d94e41938fa12086bf2dc59' into eclair-plus-aosp
* commit 'b8b984d0776ad0f34d94e41938fa12086bf2dc59':
ADT: change continuous test ant script to run both functional and unit tests.
Merge commit '7b818e955a7f71561162261b6403f50063b6c449'
* commit '7b818e955a7f71561162261b6403f50063b6c449':
Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.
Merge commit '83e2eae3fbb54cb284e96a8ce3f658f4dadba172'
* commit '83e2eae3fbb54cb284e96a8ce3f658f4dadba172':
Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.
Merge commit '67545123a4188c714fbcf24e7fe1cf1f614b610c' into eclair
* commit '67545123a4188c714fbcf24e7fe1cf1f614b610c':
Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.
This CL represents the base for the new "Graphical Editor Part".
First, GLE2 has been renamed in GraphicalEditorPart. That's the
final name, I swear I won't change it again (until next month that is.)
The editor part has 3 composites: the top ConfigConfiguration
(same as usual, reused as-is), a new PaletteComposite and a new
LayoutCanavas. This last one displays the rendering image and
will deal with interactivity.
The LayoutCanvas is actually stacked with a label which displays
the rendering error. After a rendering, either the error or the
canvas is visible, depending on the success of the operation.
That would make it easier to have a different mechanism, for example
the error could be next to the last known rendering, they don't
have to be mutually exclusive.
It is worth noting that GraphicalEditorPart is 95% similar to
the GLE1, reusing all the glue code that we had to handle
layout requestes, refresh requests, sdk/framework load listeners,
configuration and file input changes, etc.
Both PaletteComposite and LayoutCanvas are currently embryonic
at best, just to make sure the editor part is structured correctly.
Change-Id: I36c2ae4d85a68e68a349adc63a718f06375e12c5
Merge commit 'aa1be08c90507e20c1ee78d0c7cbd4fa5c40a799' into eclair
* commit 'aa1be08c90507e20c1ee78d0c7cbd4fa5c40a799':
Add test definition for cts-gesture.
'ant install' must know the debug apk filename so newer naming scheme breaks
on older rule files (1.5 and earlier).
The fix is to check for the presence of the property naming the debug,
signed, unaligned package. If the property is present, then we use
the new naming scheme ({base}[-{config}]-debug-unaligned.apk), else we use
the old one ({base}-[-{config}]-debug.apk).
Also merge the install/reinstall targets, since 'adb install -r <file>'
works even if the apk was not yet installed.
Change-Id: Id0670610a6539a3f48c955756955f950039c3cd0
