OSDN Git Service
Bill Napier [Fri, 15 Oct 2010 21:43:52 +0000 (14:43 -0700)]
Add in Windows batch file for monkeyrunner.
Change-Id: Iebe42de2c5c8eb275f6dc4756f6209726f973860
Tor Norbye [Fri, 15 Oct 2010 18:02:32 +0000 (11:02 -0700)]
Merge "Fix various bugs related to linear layout handling"
Tor Norbye [Fri, 15 Oct 2010 18:02:22 +0000 (11:02 -0700)]
Merge "Prevent layout interaction on certain layouts"
Tor Norbye [Fri, 15 Oct 2010 16:40:14 +0000 (09:40 -0700)]
Prevent layout interaction on certain layouts
Some layouts, like ZoomControls, extend another layout class (in this
case, LinearLayout), presumably for implementation convenience, but
the ZoomControl isn't intended to be used as a generic LinearLayout
where you want to drop new widgets in between its existing children,
where you want to change the orientation, etc.
Therefore, this changeset adds a new layout rule, IgnoredLayoutRule,
which various new widget-specific rules inherit from to prevent
default layout handling from kicking in.
Change-Id: Ia1323866d62859125692207159b9aa855cdf21c1
Tor Norbye [Thu, 14 Oct 2010 21:23:09 +0000 (14:23 -0700)]
Fix various bugs related to linear layout handling
This changeset fixes the following issues with LinearLayout:
* Correctly position the last insert position in the linear layout
when the layout has children.
* When you drag a widget which is already in this LinearLayout, don't
show insert positions before and after this element, and show a
match position exactly where it already is.
* Show the best-matching lines not only when you don't have bounds
(which it was already doing) but also in conjunction with the bounds
outlines. When the dragged bounds are much larger than the widgets
around the drop position, it was a bit hard to figure out where
exactly the proposed drop position is, and this change makes it a
lot clearer.
* Fix positioning of the drop rectangle. Before this change we were
positioning the drop rectangle using its existing deltaX,deltaY in
its old parent; this does not work well both in multi-document cases
as well as cases where you are dragging from one layout to
another. We are now simply positioning it at delta=0 in the new
layout; the next enhancement here would be to consider the
layoutGravity.
Change-Id: I1c71c3c48a4c104a5cde7382fb1f9a21e57122bc
Tor Norbye [Thu, 14 Oct 2010 23:33:23 +0000 (16:33 -0700)]
Merge "Hide anchor lines and tweak text positioning"
Tor Norbye [Thu, 14 Oct 2010 22:40:09 +0000 (15:40 -0700)]
Hide anchor lines and tweak text positioning
Temporarily hide the anchor lines (the lines from each selected
element to its parent's bounds edges) until we can find a way to make
it clearer what these mean.
Also tweak the pixel positioning of the selection label text to
account for the padding around the textbox mask since it was partially
overlapping the selection stroke.
Change-Id: Iaa4c7139d4d56288b78a104647d5cbb5752f7888
Tor Norbye [Thu, 14 Oct 2010 21:58:11 +0000 (14:58 -0700)]
Merge "Select dropped elements"
Tor Norbye [Thu, 14 Oct 2010 18:26:45 +0000 (11:26 -0700)]
Select dropped elements
This changeset makes the drop handler select the set of elements that
were just manipulated. This means that if you drop a new element, it
is both more visible (useful if you drop it into a crowded layout) and
immediately available for customization via the property sheet. This
is also important when you drag & drop to move existing elements since
without this, dragging a selected element meant you would *lose*
selection.
There are some timing tricks involved similar to yesterday's focus
checkin because in multi-document drag & drop the view hiearchy (which
we must consult to find the visual objects corresponding to the XML
just added to the model) may not yet be ready.
Change-Id: Ifa2d492a03a02f24303dd7cc95ab653523fb1758
Tor Norbye [Thu, 14 Oct 2010 00:43:19 +0000 (17:43 -0700)]
Merge "Prevent accidental dragging of the root layout"
Tor Norbye [Thu, 14 Oct 2010 00:07:31 +0000 (17:07 -0700)]
Prevent accidental dragging of the root layout
The layout editor deliberately does not reset the selection if you
start dragging within the bounding rectangle of one (of possibly
multiple) selected widgets. However, since it's pretty easy to have
the root element selected, this sometimes means you end up trying to
drag an item only to realize you can't because everything fits within
the root bounding rectangle.
This changeset fixes this usability issue by making the root widget a
special case. If you are dragging *only* the root, things work as
before. But if you are trying to drag anything else, it will ignore
the root, which means that you can drag one or more items
independently of the root whether or not it is included in the
selection.
Change-Id: Ia7497659e57dcc6431c3760a53847268a8b90815
Tor Norbye [Wed, 13 Oct 2010 22:26:37 +0000 (15:26 -0700)]
Merge "Fix cross-canvas refresh issue"
Xavier Ducrohet [Wed, 13 Oct 2010 22:15:34 +0000 (15:15 -0700)]
Merge "Check for platform-tools presence."
Tor Norbye [Wed, 13 Oct 2010 21:51:50 +0000 (14:51 -0700)]
Fix cross-canvas refresh issue
If you drag & drop a widget from one canvas to another canvas, the
operation seems to have no effect - the new widget is not drawn. If
you actually click on the target canvas it will suddenly appear.
We were calling redraw() on the target, but that does not seem to be
enough; an explicit focus request is necessary too (and has other
benefits; once you drop you expect that element to receive a
subsequent Delete keystroke etc).
Change-Id: I2b8cd2098dd5044fe79fc730771eede5f766d8cf
Xavier Ducrohet [Wed, 13 Oct 2010 01:13:18 +0000 (18:13 -0700)]
Check for platform-tools presence.
Change-Id: Ieaf6e42bc67829b01ebb0fa799bc615f85fc1a6d
Raphael Moll [Tue, 12 Oct 2010 23:36:15 +0000 (16:36 -0700)]
Merge "Ensure FolderWrapper only lists files and directories."
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
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
Raphael Moll [Tue, 12 Oct 2010 21:13:43 +0000 (14:13 -0700)]
Merge "SDK Manager: fix to suggest platform-tools install."
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
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
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."
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
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."
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
Tor Norbye [Mon, 11 Oct 2010 15:32:54 +0000 (08:32 -0700)]
Merge "Fix a couple of bugs."
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
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."
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
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
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
Tor Norbye [Fri, 8 Oct 2010 20:54:33 +0000 (13:54 -0700)]
Merge "Fix various warnings"
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
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
Tor Norbye [Thu, 7 Oct 2010 21:49:50 +0000 (14:49 -0700)]
Merge "Visual adjustments to the layout feedback"
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
Bill Napier [Thu, 7 Oct 2010 18:53:03 +0000 (11:53 -0700)]
Revert premature tools.atree change.
Change-Id: Ic09bccca8bb6dd195e3bc2bdf580da7a3dc5efbb
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
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
Brett Chabot [Mon, 4 Oct 2010 23:37:13 +0000 (16:37 -0700)]
Fix case where testRunEnded was called twice.
Change-Id: I14be6641c020baf0ad90f2f036e35fb854aed2ab
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
Brett Chabot [Fri, 1 Oct 2010 21:06:00 +0000 (14:06 -0700)]
Make ddmlb-tests optional.
Change-Id: Ia584549aae4bffe0ca9ddee860337cb20fa0e313
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."
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
Xavier Ducrohet [Thu, 30 Sep 2010 00:12:31 +0000 (17:12 -0700)]
In some cases release build is actually a debug build.
If the manifest sets debuggable=true then this override
the release build to be a debug build instead.
Change-Id: Ib66bf9053cecfa7c19a02cefdbf187a20bd6da37
Xavier Ducrohet [Mon, 27 Sep 2010 22:48:38 +0000 (15:48 -0700)]
SDK specific atree file. DO NOT MERGE.
Change-Id: I804f0884cb090943a968091528f60390e700bc7c
Xavier Ducrohet [Wed, 29 Sep 2010 18:21:09 +0000 (11:21 -0700)]
Add missing dependency in the ddms manifest.
Change-Id: Ifdfb8bbabf2b2aadf46ce0b27dcf99ef428d1ec9
snpe [Sun, 26 Sep 2010 16:56:30 +0000 (18:56 +0200)]
Fixing ADT features
Change-Id: Idc4223a43ef6505e55fb2b62cb2514763959bc53
Xavier Ducrohet [Mon, 27 Sep 2010 22:48:38 +0000 (15:48 -0700)]
Tools specific atree file.
Change-Id: I7a71f4d91993c48c147bc080c08f830457a23ef1
Xavier Ducrohet [Mon, 27 Sep 2010 20:27:22 +0000 (13:27 -0700)]
Make the tools work with the new location of adb.
adb has been moved to the platform-tools folder.
This changes ADT, DDMS, HierarchyViewer which all care
where adb is (to launch it).
Also fixed the local SDK parser of the SDK Updater to find
the platform-tools package.
Change-Id: I3c869159d7b0e0ad9aaea06f376b7ba3e53bfc7f
Xavier Ducrohet [Mon, 27 Sep 2010 17:09:55 +0000 (10:09 -0700)]
Ant doc on how to replace proguard.
Change-Id: I27faad2282fbe6cff565d945c2b64d42d31db1fe
Xavier Ducrohet [Fri, 24 Sep 2010 19:55:24 +0000 (12:55 -0700)]
Make it easier to use a different obfuscator.
Change-Id: I3fb80a8b91482de5117a9e093b2d50010bb99546
Xavier Ducrohet [Fri, 17 Sep 2010 01:53:44 +0000 (18:53 -0700)]
Use proguard for release builds through Ant.
This is only activated if default.properties contains
a property "proguard.config" with the name of a proguard
config file.
Some clean-up in the Ant tasks and in the name
of the properties used by the rules and the custom
tasks to make them clearer.
Added a new test app with a project using a jar file
as well as a library using a jar file.
Change-Id: Ia8f4d873025993d454c0a484e61d47ae679ea79c
Xavier Ducrohet [Fri, 24 Sep 2010 21:51:22 +0000 (14:51 -0700)]
Work around a bug in the jar verifier of Android.
up to Android 1.6, if the signature file of an apk was
a multiple of 1024 the jar verification failed.
This make sure the signing code in ADT/Ant does not
generate such a signature file by adding an extra CRLF
at the end.
See http://b.android.com/830
Change-Id: Ia9ec0563d2abfaa6402ca4d19ca27335e9ba57a3
Xavier Ducrohet [Fri, 24 Sep 2010 21:30:52 +0000 (14:30 -0700)]
Merge "Make javac ant options configurable."
Xavier Ducrohet [Fri, 24 Sep 2010 21:19:34 +0000 (14:19 -0700)]
Merge "Don't force a workspace build on launch."
Xavier Ducrohet [Fri, 24 Sep 2010 15:11:12 +0000 (08:11 -0700)]
Make javac ant options configurable.
Change-Id: I303acdb4fc8de6ba5d8de7c18e020e97fe01e3de
Xavier Ducrohet [Fri, 24 Sep 2010 14:19:37 +0000 (07:19 -0700)]
Don't force a workspace build on launch.
Bug: http://b.android.com/11452
Change-Id: Ibbb8b15ef448694fc8975f6fb32b1703e9edd54f
Xavier Ducrohet [Fri, 24 Sep 2010 14:41:30 +0000 (07:41 -0700)]
Fix target loading when sdk.properties is not present.
Older (obsolete) targets would fail to load if
sdk.properties was not present. Since the content
is optional anyway, it's ok to load the target.
Change-Id: I6539be1450e72096de7b651e1c9137b41060e315
Bill Napier [Thu, 23 Sep 2010 16:50:37 +0000 (09:50 -0700)]
Merge "Improve waitForConnection for booting devices."
Jean-Baptiste Queru [Thu, 23 Sep 2010 16:49:54 +0000 (09:49 -0700)]
merge from tools_r7
Change-Id: I15581b778be83b662b23994e53ff9c22ab796667
Bill Napier [Thu, 23 Sep 2010 16:43:30 +0000 (09:43 -0700)]
Improve waitForConnection for booting devices.
Have waitForConnection actually wait until the device is ONLINE before returning
it. Also give the on device monkey some more time to startup.
Change-Id: I86193a8532a84d64dddd9a60012af4f3ef507841