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
'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.
DO NOT MERGE
Added an example for using AlertDialog in Multichoice mode backed up by Cursor. This example can be used to test the following bug: http://code.google.com/p/android/issues/detail?id=955
AMEND:
Added a Toast to display readonly status of cursor, so data will not be updated.
Removed empty code blocks, which did nothing.
Resource filters are used when generating additional APK containing only
specific resources.
The previous UI allowed for any type of filters, but we are moving to a
simpler way with fixed filters.
The first one is the density. Selecting the filter will generate 4 APKs per
application: default (all resources), hdpi (only hdpi/nodpi and default
resources), mdpi, ldpi.
Merge commit 'b8a74f45519830f2695b74f39fc9097659e28969'
* commit 'b8a74f45519830f2695b74f39fc9097659e28969':
ADT: Fix some potential NPE in the configuration composite.
This is just based on Eclipse static analysis of potential null pointers.
It doesn't mean we were ever going to have any NPE there.
Change-Id: I2a326048d2eb6afff7598f9300f48e35495ff3c2
This adds a @since GLE1 to all classes involved in the current GLE
and a @since GLE2 to the new classes. The idea is that both classes
are going to be mixed in the same packages and it will help later
to remove the old GLE by just searching for this specific tag.
The alternative would be to move the classes in a sub-package
layout.gle1 vs layout.gle2, but that seems unecessary.
Change-Id: I577cd81819db4c6e0209ebbd910a393fc2182619
