OSDN Git Service
The Android Open Source Project [Wed, 13 Oct 2010 22:26:59 +0000 (15:26 -0700)]
merge from open-source master
Change-Id: Iebdc036d678de9aefd40050cb25ce09939e88913
Xavier Ducrohet [Wed, 13 Oct 2010 22:15:34 +0000 (15:15 -0700)]
Merge "Check for platform-tools presence."
Xavier Ducrohet [Wed, 13 Oct 2010 01:13:18 +0000 (18:13 -0700)]
Check for platform-tools presence.
Change-Id: Ieaf6e42bc67829b01ebb0fa799bc615f85fc1a6d
The Android Open Source Project [Tue, 12 Oct 2010 23:45:22 +0000 (16:45 -0700)]
merge from open-source master
Change-Id: I60ad346ce0a86ed43259afad33981461fe53cc3b
Raphael Moll [Tue, 12 Oct 2010 23:36:15 +0000 (16:36 -0700)]
Merge "Ensure FolderWrapper only lists files and directories."
The Android Open Source Project [Tue, 12 Oct 2010 23:32:21 +0000 (16:32 -0700)]
merge from open-source master
Change-Id: I99a8bb12feb05d53d3303fe4c303ffd3f3716924
Tor Norbye [Tue, 12 Oct 2010 23:30:24 +0000 (16:30 -0700)]
Merge "Fix drag and drop of unselected item"
Tor Norbye [Tue, 12 Oct 2010 23:30:08 +0000 (16:30 -0700)]
Merge "Fix Orientation context menu for LinearLayout."
Tor Norbye [Tue, 12 Oct 2010 23:22:29 +0000 (16:22 -0700)]
Fix Orientation context menu for LinearLayout.
If you open a LinearLayout where the orientation has not been
specified in XML, then the context menu will say that the orientation
is vertical, but visually the layout is actually horizontal. (The
default value for LinearLayout is documented to be horizontal.)
Change-Id: Id16797d9226b19eb53c2b59249844e2406b049e4
The Android Open Source Project [Tue, 12 Oct 2010 23:14:23 +0000 (16:14 -0700)]
merge from open-source master
Change-Id: I577a12b8961cd28dcb3238a1e484c689c0d578e7
Jean-Baptiste Queru [Tue, 12 Oct 2010 22:54:15 +0000 (15:54 -0700)]
merge from tools_r7
Change-Id: I2fab5e04b9e93009d1c40fcb887497b588abd8c8
Jean-Baptiste Queru [Tue, 12 Oct 2010 22:54:02 +0000 (15:54 -0700)]
ignore from tools_r7
Change-Id: I4a56d059c30716bbafb794a3d1a741b724ee40ea
Tor Norbye [Tue, 12 Oct 2010 21:32:13 +0000 (14:32 -0700)]
Fix drag and drop of unselected item
If you have no selection and start dragging a view, nothing
happens. This fixes this such that when dragging begins, the item you
are dragging becomes selected. This also works where you have a
selection and you start dragging some other (non-selected) item.
Change-Id: I20fc400504f375b75c1ed17ec4850420a8500edd
Raphael Moll [Tue, 12 Oct 2010 21:15:26 +0000 (14:15 -0700)]
Ensure FolderWrapper only lists files and directories.
This matches the description of the original File.list better
and avoid us seeing non-file objects that we can't deal with
(e.g. pipes, etc.)
Change-Id: Ie47c9926c2db4cd2605d277fe847c6a60e180d09
The Android Open Source Project [Tue, 12 Oct 2010 21:20:34 +0000 (14:20 -0700)]
merge from open-source master
Change-Id: I721c1210196700e9050eda8546e5fba7e793c0eb
Raphael Moll [Tue, 12 Oct 2010 21:13:43 +0000 (14:13 -0700)]
Merge "SDK Manager: fix to suggest platform-tools install."
The Android Open Source Project [Tue, 12 Oct 2010 21:07:06 +0000 (14:07 -0700)]
merge from open-source master
Change-Id: Icfe4245e0fa67f26ea6da3334757aadb995123ab
Raphael Moll [Tue, 12 Oct 2010 21:04:15 +0000 (14:04 -0700)]
Merge "SDK Manager: fix File.listfiles()"
Raphael Moll [Tue, 12 Oct 2010 20:26:54 +0000 (13:26 -0700)]
SDK Manager: fix to suggest platform-tools install.
The way the updater currently works, it will only
generate the source.props of a new package based on the
attributes it knows from that package. That means mean
Tools r7 is updating tools, it will not add the proper
min-platform-tools-rev to the new Tools r8 package.
When "Update All" is selected, we try to do 2 new things:
- make sure to lool at local *existing* packages for
potential missing dependencies, and suggest them for
install.
- if a package doesn't have a min-platform-tools-rev set,
suggest the higest revision available.
Change-Id: I76cdbc2818133429b2726d3127eedd7e65579a7e
Raphael Moll [Tue, 12 Oct 2010 20:06:48 +0000 (13:06 -0700)]
SDK Manager: fix File.listfiles()
This fixes a couple instances of File.listfiles() that
were not validating that either a/ the file is a directory
or b/ the list is not null.
This also adds a couple toString() methods to some repo
classes, which are nice when debugging.
Change-Id: I8912d12c5344c8b511d84a58fe4693632315dff0
The Android Open Source Project [Tue, 12 Oct 2010 18:17:31 +0000 (11:17 -0700)]
merge from open-source master
Change-Id: I7212fa997817a0c79dfbe74d168019c54aa00138
Xavier Ducrohet [Tue, 12 Oct 2010 18:16:41 +0000 (11:16 -0700)]
Merge "Volume keys need to be wake keys in order for them to work when the screen is off." into tools_r7
Tor Norbye [Tue, 12 Oct 2010 18:09:51 +0000 (11:09 -0700)]
Merge "Fix drag and drop handler to handle reentry"
Tor Norbye [Tue, 12 Oct 2010 16:41:22 +0000 (09:41 -0700)]
Fix drag and drop handler to handle reentry
If you drag from the palette over a linear layout view, you get drop
feedback. However, if you drag outside the linear layout and then back
in, you often don't get any more feedback. This happens pretty easily
with nested layouts.
The problem is that the feedback object is initialized and reset in
onDropEnter, but the actual guideline computation happens in
onDropMove (since only drop move is handed the mouse coordinates). The
bug happens because when you leave and return to the drop zone, the
feedback object is reset, and then the drop feedback is painted - all
before the onDropMove code has been called again.
The fix is simple: On drop enter, also call onDropMove immediately
such that the layout helpers are given a chance to initialize
themselves with the entry mouse position, before they are consulted
for drop feedback data.
This changeset also contains a fix for LinearLayouts: When there are
no children, place the guideline at x=0 or y=0 (depending on whether
the layout is horizontal or vertical). Without this fix, the line is
placed in the center of the view, which is misleading since that is
not where the view will be placed upon drop.
Change-Id: Ib5e17a2d9d3818677e4209126233bbde527207c8
The Android Open Source Project [Tue, 12 Oct 2010 01:24:00 +0000 (18:24 -0700)]
merge from open-source master
Change-Id: Ifc5c8e584cb8324241019bb09eddccfb58325654
Tor Norbye [Tue, 12 Oct 2010 01:14:08 +0000 (18:14 -0700)]
Merge "Fix Issue 11735: The Delete key does not always work"
Tor Norbye [Tue, 12 Oct 2010 01:13:56 +0000 (18:13 -0700)]
Merge "Improve visual feedback for relative layout and frame layout."
The Android Open Source Project [Mon, 11 Oct 2010 23:07:19 +0000 (16:07 -0700)]
merge from open-source master
Change-Id: Ie00989060f41e743583d77e33af4bd680fb8296b
Raphael Moll [Mon, 11 Oct 2010 23:00:45 +0000 (16:00 -0700)]
Merge "SDK Manager: local package list can be empty."
Raphael Moll [Mon, 11 Oct 2010 22:59:04 +0000 (15:59 -0700)]
SDK Manager: local package list can be empty.
Change-Id: I44a063ffb69002b10c7db5141036e82f23e7da49
Joe Onorato [Mon, 11 Oct 2010 18:29:33 +0000 (11:29 -0700)]
Volume keys need to be wake keys in order for them to work when the screen is off.
Bug:
3083496
Change-Id: I9b456cf002a8a9d953d631c163054f8ccc9572fa
Tor Norbye [Mon, 11 Oct 2010 21:43:01 +0000 (14:43 -0700)]
Improve visual feedback for relative layout and frame layout.
Improve the visual feedback for the relative layout and the frame
layouts:
1. When there is multiple selection, don't draw adjacent boxes (since
that's not how things will look once you drop); instead, draw
overlapped boxes, For example if you drag a button and a clock, the
button will be placed on top of the clock, not next to it, in both
layouts.
2. Replace the center oval+x pattern with the stippled orange line
pattern, and make some fixes to relative layout such that (when we
have bounds) the preview rectangle is positioned correctly for the
parent-relative bounds.
Change-Id: Ie4c7b127cb28d9fedf194e9067f2fa9c82ede44e
Tor Norbye [Mon, 11 Oct 2010 18:46:35 +0000 (11:46 -0700)]
Fix Issue 11735: The Delete key does not always work
Add Backspace as a key handler for the logical delete action.
Most Macs have a Delete key that actually corresponds to
a backspace action, so we must handle SWT.BS, not just
SWT.DEL. I didn't make this code Mac-specific since having
both backspace and delete work in the canvas editor to delete
the selection seems useful.
Change-Id: I8b0be10cb46ba8a16126bbc3cc59832414d7993a
The Android Open Source Project [Mon, 11 Oct 2010 18:06:50 +0000 (11:06 -0700)]
merge from open-source master
Change-Id: I1e69603b2d46eb071822dc7fac667bb02649e15a
Xavier Ducrohet [Mon, 11 Oct 2010 17:59:53 +0000 (10:59 -0700)]
Merge "Make sure all marker types are removed during clean."
Xavier Ducrohet [Mon, 11 Oct 2010 17:59:48 +0000 (10:59 -0700)]
Merge "Display SDK/plug-in incompatibility messages."
The Android Open Source Project [Mon, 11 Oct 2010 17:43:03 +0000 (10:43 -0700)]
merge from open-source master
Change-Id: I3dc96f827f93100d85095cf3ed6894877586a49b
Raphael Moll [Mon, 11 Oct 2010 17:40:17 +0000 (10:40 -0700)]
Merge "SDK Manager: simplify getenv var to override URLs."
Raphael Moll [Mon, 11 Oct 2010 17:04:12 +0000 (10:04 -0700)]
SDK Manager: simplify getenv var to override URLs.
SDK_TEST_URLS is a semicolon-separated list of URLs that can be used to
seed the SDK Updater list. This is only meant as a debugging and QA testing
tool and not for user usage.
To be used, the URLs must either end with the / or end with the canonical
filename expected for an addon list, addon repo or full repo.
This lets QA use URLs ending with / to cover all cases.
Change-Id: Ia7232d5d8a5b6e85d98e735b93a969e42624e919
The Android Open Source Project [Mon, 11 Oct 2010 15:39:43 +0000 (08:39 -0700)]
merge from open-source master
Change-Id: I9f657c855821f0cc4d62f656ab0822c7d7307936
Tor Norbye [Mon, 11 Oct 2010 15:32:54 +0000 (08:32 -0700)]
Merge "Fix a couple of bugs."
The Android Open Source Project [Mon, 11 Oct 2010 00:57:53 +0000 (17:57 -0700)]
merge from open-source master
Change-Id: I02ef9a007aa700fa22e774b9e7d24c7eacaf5d48
Raphael Moll [Mon, 11 Oct 2010 00:50:53 +0000 (17:50 -0700)]
Merge "SDK Manager: manage URL sites grouped in categories."
Raphael Moll [Sun, 10 Oct 2010 01:04:10 +0000 (18:04 -0700)]
SDK Manager: manage URL sites grouped in categories.
Sources are now grouped in categories:
- android official site
- all 3rd party addons which list is remotely fetched
- local overrides (from getenv SDK_UPDATER_(USER_)URLS)
- user-added add-on URLs
SdkSources (plural Sources) is the collection of all URL
sites (each one being an SdkSource that contains a collection
of packages).
SdkSourceCategory is the category of a given SdkSource.
Each source has its download URL but also an UI-visible name
which is displayed if known -- this is used for our default
android source and for 3rd party remote addons.
For all source overrides (e.g. user added or from the getenv
vars) we'll simply display the URL in the tree.
Change-Id: Idc3e9ba3395818e33fc7505ead7b0bd0be867ea3
The Android Open Source Project [Sun, 10 Oct 2010 23:58:00 +0000 (16:58 -0700)]
merge from open-source master
Change-Id: I8a9b6a402ab9f6bb3470817f16cd6ae846ba36f0
Raphael Moll [Sun, 10 Oct 2010 23:56:45 +0000 (16:56 -0700)]
Merge "SDK Manager: remove userCanChangeSdkRoot flag."
Raphael Moll [Sun, 10 Oct 2010 23:56:29 +0000 (16:56 -0700)]
Merge "SDK Repo: Remove useless xsi namespace from unit-test XMLs."
Raphael Moll [Sun, 10 Oct 2010 23:56:19 +0000 (16:56 -0700)]
Merge "SDK Manager: XML schema for addons-list."
The Android Open Source Project [Sun, 10 Oct 2010 20:56:19 +0000 (13:56 -0700)]
merge from open-source master
Change-Id: I94c5a64731eff54534bd729ee8cdd3437da524ca
Bill Napier [Sat, 9 Oct 2010 00:38:14 +0000 (17:38 -0700)]
Add MonkeyRunner script (and libs) to SDK.
Change-Id: I75d082fc2c69f994197f5887c3f38ad30cfe7bfb
Xavier Ducrohet [Sun, 10 Oct 2010 20:03:41 +0000 (13:03 -0700)]
Make sure all marker types are removed during clean.
Change-Id: I2a045488b86d03496d766c5c9ade9bb64fcb9246
Xavier Ducrohet [Fri, 8 Oct 2010 22:39:04 +0000 (15:39 -0700)]
Display SDK/plug-in incompatibility messages.
Hmm this used to work. But the lines displaying the error
messages are gone...
Change-Id: I83cf7d3e8a471fe6b2166818db9fad4f60d3d392
Raphael Moll [Sat, 9 Oct 2010 23:25:50 +0000 (16:25 -0700)]
SDK Manager: remove userCanChangeSdkRoot flag.
We've never enabled the UI for it as the SDK path
is dicated by where the manager is started from, so
it's time to clean it up.
Change-Id: I97d7ede19e869b970e649ea8a6f9b94045a71269
Raphael Moll [Sat, 9 Oct 2010 22:18:07 +0000 (15:18 -0700)]
SDK Repo: Remove useless xsi namespace from unit-test XMLs.
All the sample XMLs still declare a line
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance
We don't use that namespace anymore so we don't need that line.
Change-Id: I620680d1f1fb7e8196ddf0cbc13836439f3e6a6a
Tor Norbye [Fri, 8 Oct 2010 21:43:45 +0000 (14:43 -0700)]
Fix a couple of bugs.
Using File.toURL() is dangerous because the reverse operation
(URLDecoder.decode, which for example is used by URLClassLoader to
produce a path from URLs) doesn't always succeed - for example on a
filename like "/tmp/te#st". Use File.toURI().toURL() instead.
The second problem looks like an unintentional || instead of &&.
Change-Id: Ib4e2ac13c914c002eff53455ed6d6ed898ce35fb
Raphael Moll [Sat, 9 Oct 2010 06:02:10 +0000 (23:02 -0700)]
SDK Manager: XML schema for addons-list.
Change-Id: I64db42737bf70365c7016c1292087ebbf505cea7
The Android Open Source Project [Fri, 8 Oct 2010 22:54:35 +0000 (15:54 -0700)]
merge from open-source master
Change-Id: I512ca46b9579f24774b1a56f8d5531a150d090b6
Xavier Ducrohet [Fri, 8 Oct 2010 22:43:07 +0000 (15:43 -0700)]
Merge "Proguard default config file."
Xavier Ducrohet [Wed, 6 Oct 2010 22:06:53 +0000 (15:06 -0700)]
Proguard default config file.
It is located in $SDK/tools/lib/proguard.cfg and automatically
put in Ant project (create and update if project is not already setup
for proguard).
Change-Id: I9bcb2a5aafec1329b0c001799f4ba34c61569c3a
The Android Open Source Project [Fri, 8 Oct 2010 22:42:10 +0000 (15:42 -0700)]
merge from open-source master
Change-Id: Iaffa30e486413625ade78715268218fc9b9ac243
Tor Norbye [Fri, 8 Oct 2010 22:27:35 +0000 (15:27 -0700)]
Fix bug in constraint display.
Need explicit parens to ensure proper Groovy evaluation order.
This short script shows the difference between the old and
new forms:
groovy> def id = "hello"
groovy> def it = "world"
groovy> def strings = []
groovy> strings << (id ? it + "=" + id : it)
groovy> println "strings 1 = $strings"
groovy> strings = []
groovy> strings << id ? it + "=" + id : it
groovy> println "strings 2 = $strings"
strings 1 = [world=hello]
strings 2 = [hello]
Change-Id: Iab1bc50656b1b975a522e5742240075600bab596
The Android Open Source Project [Fri, 8 Oct 2010 21:03:28 +0000 (14:03 -0700)]
merge from open-source master
Change-Id: I91b0b184d15e059c6dc5c583540ee455b342a8dc
Tor Norbye [Fri, 8 Oct 2010 20:54:33 +0000 (13:54 -0700)]
Merge "Fix various warnings"
The Android Open Source Project [Fri, 8 Oct 2010 20:38:37 +0000 (13:38 -0700)]
merge from open-source master
Change-Id: Ic4a4ab08f4ffc9be3425a70b72bb26d3184a5c61
The Android Open Source Project [Fri, 8 Oct 2010 19:47:13 +0000 (12:47 -0700)]
merge from open-source master
Change-Id: I357a5183a2a5edc91c5dba888f20c283359f047f
Tor Norbye [Thu, 7 Oct 2010 21:12:31 +0000 (14:12 -0700)]
Remove Groovy Closures from the tool integration API.
Remove Groovy Closures from the tool integration API, and replace with
dedicated single-method-interfaces (which can also be invoked as
closures from Groovy - but which also would allow non-Groovy
implementations to work as View handlers).
Also add warning to the javadoc for the interfaces that this is
neither a public nor a final API.
Change-Id: Ia146e1e150c2d47f95ff5bbb0771efc0e3aaa5ad
Raphael Moll [Fri, 8 Oct 2010 18:54:20 +0000 (11:54 -0700)]
ADT: use annotations from sdklib
The removes Nullable and VisibleForTesting from ADT
and replaces them by their new versions from sdklib.
Change-Id: I2784e9d044a29a70dcd6258bb45e553246dfd477
The Android Open Source Project [Fri, 8 Oct 2010 18:34:56 +0000 (11:34 -0700)]
merge from open-source master
Change-Id: I8344c7c53186aaa42899575e4ff13f11a135fe82
Pierre Zurek [Sun, 26 Sep 2010 20:19:35 +0000 (22:19 +0200)]
Go to problem in source from Logcat via Double-click.
The user can choose in the LogCat Preference Page what
will be the default behaviour (go to method declaration
or go to error line).
There are now 2 available actions in the LogCat View
instead of the unique "Go to Problem" (which is now
called "Go to Problem (method declaration)").
Change-Id: I769771b29d26b625cfd0250fa23e6627821be16d
The Android Open Source Project [Thu, 7 Oct 2010 21:58:59 +0000 (14:58 -0700)]
merge from open-source master
Change-Id: Ib789754dd5fa04ea4232220c8a06bda9051b75c3
Tor Norbye [Thu, 7 Oct 2010 21:49:50 +0000 (14:49 -0700)]
Merge "Visual adjustments to the layout feedback"
The Android Open Source Project [Thu, 7 Oct 2010 21:46:46 +0000 (14:46 -0700)]
merge from open-source master
Change-Id: Ic68c91a666c475bce81f0d8a10aebdb1c6091f97
Raphael Moll [Thu, 7 Oct 2010 21:44:46 +0000 (14:44 -0700)]
Merge "SDK Manager: support separate addon.xml schema"
Tor Norbye [Thu, 7 Oct 2010 15:56:12 +0000 (08:56 -0700)]
Fix various warnings
Change-Id: I4864b89347ed8756b1eae83d97990555144fb93a
The Android Open Source Project [Thu, 7 Oct 2010 18:55:34 +0000 (11:55 -0700)]
merge from open-source master
Change-Id: Ib0241b6df43dae934d59089ff60fbf4125d4f6e1
Bill Napier [Thu, 7 Oct 2010 18:53:03 +0000 (11:53 -0700)]
Revert premature tools.atree change.
Change-Id: Ic09bccca8bb6dd195e3bc2bdf580da7a3dc5efbb
The Android Open Source Project [Thu, 7 Oct 2010 18:07:26 +0000 (11:07 -0700)]
merge from open-source master
Change-Id: I443b7b9ef2c67ff84c17755a6637e6a8fda0f2e9
Bill Napier [Thu, 7 Oct 2010 18:05:04 +0000 (11:05 -0700)]
Merge "Bridge MonkeyRunnerExported tags into pydoc."
Bill Napier [Sat, 2 Oct 2010 03:58:40 +0000 (20:58 -0700)]
Bridge MonkeyRunnerExported tags into pydoc.
This allows the use of pydoc to generate MonkeyRunner
API documentation.
Change-Id: I0af981f2023abf2cbf92cb1d7c9132936414c559
The Android Open Source Project [Thu, 7 Oct 2010 14:24:07 +0000 (07:24 -0700)]
merge from open-source master
Change-Id: I0eae9fb8cb9b11a74ecc765d318ab26cbe7f650b
Tor Norbye [Wed, 6 Oct 2010 22:30:37 +0000 (15:30 -0700)]
Visual adjustments to the layout feedback
This changeset makes a number of adjustments to the visual feedback
shown during layout dragging & dropping, selection, etc.
These are:
1. Render text on top of a translucent mask (white on a transparent
gray rectangle). This ensures that the text is readable regardless of
what content is under the text. We can't just use the background color
for the normal SWT drawString for two reasons: First, we need to
control the alpha of the background only (since we want the text to be
opaque and the background to be translucent), and second, we often
want to draw multiple lines of text, so we need to manually draw a
background rectangle which accommodates the maximum width of ALL the
lines such taht we don't have a ragged background.
2. Paint the outline mode lines using solid, translucent lines. And
adjust the bounding box computation in this case by 1 pixel such that
when you have adjacent boxes (such as in LinearLayout), you don't end
up with two thin lines next to each other creating a thick line.
3. Change the DrawingStyle internal API from "foreground" and
"background" colors to "stroke" (border) and "fill" (interior), with
individual alphas. This makes the color definitions simpler (for
example we don't need two separate styles, one for the selection
border and one for the selection interior).
4. Make the hover more subtle, using no border and just a light
translucent gray rectangle to only slightly draw attention to the view
under the mouse.
5. Change the appearance of selection to light blue and use a long
dashed border around it. The anchor lines are more faint and more
translucent to make them stand out less.
6. Change the appearance of the drop-preview to use a dash patterned
border identical to the selection border, but colored orange instead.
The matching border pattern will hopefully reinforce that the
drop-preview line is where the selection (also dashed) will go.
7. Use green to show available drop zones (the grid surrounding a
target in RelativeLayout, and the positions between elements in
LinearLayout).
8. For invalid drops, use a white X on a red background as the overlay
fill.
9. I replaced the oval+X pattern from the LayoutHelpers and replaced
them with the orange dashed insert-position lines. I also adjusted the
LinearLayout to draw the bounding boxes such that the middle of the
bounding box, rather than the top left edge, are aligned with the
insert position.
Change-Id: I85c77b9fa84b732a78aac635442f96e7ccfc3983
Raphael Moll [Wed, 6 Oct 2010 00:09:38 +0000 (17:09 -0700)]
SDK Manager: support separate addon.xml schema
This splits sdk-repository-3.xsd into 2 XML schemas,
one for the sdk-repository and one for the sdk-addon.
The SDK Manager is then modified to only load <addon>
and <extra> from the sdk-addon whils the <sdk-repository>
supports everything (including <addon> if the old v1 or v2
schemas are being used).
Change-Id: I30b263f2ab48dd3ea7b70d3006fb6516291736d0
Xavier Ducrohet [Fri, 1 Oct 2010 18:34:53 +0000 (11:34 -0700)]
Add proguard support in the release build mode of ADT.
This is only activated if default.properties contains a proguard.config
property.
Change-Id: I9921b2796a423330bffa37e795399cf5cec948ab
The Android Open Source Project [Tue, 5 Oct 2010 18:20:13 +0000 (11:20 -0700)]
merge from open-source master
Change-Id: I5db2a38f681d2168dfb801d6ad9a4a1243d3edba
Brett Chabot [Mon, 4 Oct 2010 23:37:13 +0000 (16:37 -0700)]
Fix case where testRunEnded was called twice.
Change-Id: I14be6641c020baf0ad90f2f036e35fb854aed2ab
The Android Open Source Project [Mon, 4 Oct 2010 22:22:43 +0000 (15:22 -0700)]
merge from open-source master
Change-Id: I0b65c8c5425024aec3817848410a88e474d87b00
Xavier Ducrohet [Mon, 4 Oct 2010 22:15:43 +0000 (15:15 -0700)]
Merge "Fixing ADT features"
Raphaël Moll [Mon, 4 Oct 2010 20:57:31 +0000 (13:57 -0700)]
Merge "Add drawing styles to the layout helper API"
Tor Norbye [Sat, 2 Oct 2010 01:44:27 +0000 (18:44 -0700)]
Add drawing styles to the layout helper API
Pull color constants out of the specific layout helper classes (groovy
scripts) and the canvas editor and use a generic style enum instead in
the interface, and associate the visual attributes (color, line style,
thickness, alpha) with a swt-specific enum on the editor side. There
is a single new API method which takes an enum parameter, which should
let us add drawing styles over time. By having the color definitions
on the tool side rather in the specific layout helpers it's not only
easier to change the colors but also easier to ensure that the
different helper all stay consistent as we change color schemes.
In the immediate term (next integration) I'll change some of the
colors; after that we should make the colors adapt to the chosen
theme, and eventually these should be provided via the SDK from the
themes themselves.
This changeset doesn't actually change the colors used for the various
types of visual feedback (selection, hover, drop-zone, etc) - I'll
investigate that next. For that reason I also didn't replace all the
various client-side color usage in the RelativeLayout.
Change-Id: Iddf4ace9006ec02d9907c3c37d539ab7414f1371
The Android Open Source Project [Fri, 1 Oct 2010 21:16:05 +0000 (14:16 -0700)]
merge from open-source master
Change-Id: Ib9a3c29118ca3b933295fa7c917c938fd26fa930
Brett Chabot [Fri, 1 Oct 2010 21:06:00 +0000 (14:06 -0700)]
Make ddmlb-tests optional.
Change-Id: Ia584549aae4bffe0ca9ddee860337cb20fa0e313
The Android Open Source Project [Fri, 1 Oct 2010 20:02:00 +0000 (13:02 -0700)]
merge from open-source master
Change-Id: Ic53d217bf6b2008bb394f31aac8441a99e449201
Xavier Ducrohet [Thu, 30 Sep 2010 23:11:24 +0000 (16:11 -0700)]
Merge "In some cases release build is actually a debug build."
Brett Chabot [Thu, 30 Sep 2010 18:28:39 +0000 (11:28 -0700)]
Merge "Fix ddmlib test run failure and metric reporting."
Brett Chabot [Wed, 29 Sep 2010 23:55:00 +0000 (16:55 -0700)]
Fix ddmlib test run failure and metric reporting.
This submit fixes two bugs:
1) Test run failures were not getting reported correctly in some scenarios, and
in others testRunFailed was being called before testRunStarted was called. With
this submit, the order of ITestRunListener callbacks is documented and strictly
adhered to.
2) test metrics were getting reported for regularly occuring instrumentation
output such as 'stream' and 'id'.
Also cleaned up the associated unit tests and changed them to use easymock.
Change-Id: I4cee3abebdf1c607ac1dc51a240c92ca9611ca31
Bill Napier [Thu, 30 Sep 2010 17:21:32 +0000 (10:21 -0700)]
Merge "Add in support for the sys.executable variable."
Bill Napier [Thu, 30 Sep 2010 17:07:50 +0000 (10:07 -0700)]
Add in support for the sys.executable variable.
This allows things like pydoc to work.
Change-Id: I16206a17099f7a3785ebcb303bd760b65db36b68
Raphael Moll [Thu, 30 Sep 2010 16:54:58 +0000 (09:54 -0700)]
Merge "ADT: Fix attributes UI in Android Manifest Editor."
The Android Open Source Project [Thu, 30 Sep 2010 15:29:26 +0000 (08:29 -0700)]
merge from open-source master
Change-Id: Ief0d8b20aeddb245f9ebaa4989d06d6eb86d12fd
Raphael Moll [Thu, 30 Sep 2010 01:48:10 +0000 (18:48 -0700)]
ADT: Fix attributes UI in Android Manifest Editor.
External bug: http://b.android.com/11392
Issue: all customized fields were showing as regular "string"
references (with the default string browser) instead of having
customized pre-selected choices, etc.
The core issue is that the UI widgets were created using reflection
but I changed the base class constructor of the default
TextAttributeDescriptor recently and forgot to update DescriptorUtils
accordingly. Since it was failing to create a custom widget it was
reverting to the default UI for a string reference.
The long-term fix is to stop using reflection.
Creator pattern to the rescue!
Instead there's a new ITextAttributeCreator interface and the
override map uses a static "creator" instance that will instantiate
the correct UI widget when needed.
Change-Id: Ie7afbf682a2aa8ae18565d08445e73a8c051a6c7