OSDN Git Service
The Android Open Source Project [Fri, 15 Oct 2010 22:37:53 +0000 (15:37 -0700)]
merge from open-source master
Change-Id: Id9e817800d9073265930d282b07b5c743e9e6919
Xavier Ducrohet [Fri, 15 Oct 2010 22:27:12 +0000 (15:27 -0700)]
Merge "Editors preference page."
Bill Napier [Fri, 15 Oct 2010 22:18:49 +0000 (15:18 -0700)]
Merge "Add in Windows batch file for monkeyrunner."
Raphael Moll [Fri, 15 Oct 2010 22:18:46 +0000 (15:18 -0700)]
Merge "SDK Manager: display URL host in source tree."
The Android Open Source Project [Fri, 15 Oct 2010 22:00:01 +0000 (15:00 -0700)]
merge from open-source master
Change-Id: Ib5eed8b3d72b3f87b2e702ed5630d13af22cea06
Raphael Moll [Fri, 15 Oct 2010 21:48:06 +0000 (14:48 -0700)]
Merge "SDK Manager: Fix dependencies when installing selected packages."
Bill Napier [Fri, 15 Oct 2010 21:43:52 +0000 (14:43 -0700)]
Add in Windows batch file for monkeyrunner.
Change-Id: Iebe42de2c5c8eb275f6dc4756f6209726f973860
Xavier Ducrohet [Fri, 15 Oct 2010 21:30:16 +0000 (14:30 -0700)]
Editors preference page.
For now, only the monitor density, used by the zoom control
in the GLE.
Change-Id: I01219609e6196d845d45e306f5b93c3acf0b2ee2
Raphael Moll [Fri, 15 Oct 2010 20:50:16 +0000 (13:50 -0700)]
SDK Manager: display URL host in source tree.
Change-Id: I2fd27d931fe9011cc2894c7179e2e14327867b94
The Android Open Source Project [Fri, 15 Oct 2010 21:23:02 +0000 (14:23 -0700)]
merge from open-source master
Change-Id: Ib348e701b2298d9154a5a0e662d4ec267bccd64a
Xavier Ducrohet [Fri, 15 Oct 2010 21:04:51 +0000 (14:04 -0700)]
Merge "Connect the resolution chooser to the zoom control in GLE"
Xavier Ducrohet [Fri, 15 Oct 2010 21:04:46 +0000 (14:04 -0700)]
Merge "Project property cleanup."
The Android Open Source Project [Fri, 15 Oct 2010 20:44:23 +0000 (13:44 -0700)]
merge from open-source master
Change-Id: Ia14f6b04ea7cd24f94a0ae07522b58afa9cd7ffc
Xavier Ducrohet [Fri, 15 Oct 2010 20:30:45 +0000 (13:30 -0700)]
Connect the resolution chooser to the zoom control in GLE
When using the Real-Life zoom control the first time, it
will display the Resolution chooser (from the AVD start dialog)
to let the user figure out their monitor dpi.
Next Step: add the actual density to a prefs panel so that it
can be manually tweaked.
Change-Id: If2322dd077b657386ab0452f9c507cb3c0730c32
Raphael Moll [Fri, 15 Oct 2010 20:32:37 +0000 (13:32 -0700)]
SDK Manager: Fix dependencies when installing selected packages.
In the SDK Manager, when you select a specific package from an
available repository to install it, it used to not notice if there
was a broken depedency. This fixes it. It means we have to force
loading all known available repo sources to find them if necessary.
This CL fixes a minor issue: trim all URLs before trying to use
them. The CL is voluntarily a bit defensive for that. This can
happen when we load URLs from external addon sites which we do
not control.
Change-Id: I652e1fa0e74b4384d0e95819970a59519fafa05a
Tor Norbye [Fri, 15 Oct 2010 20:33:08 +0000 (13:33 -0700)]
Merge "Make drag and drop create a single undo operation"
Xavier Ducrohet [Thu, 14 Oct 2010 18:36:29 +0000 (11:36 -0700)]
Project property cleanup.
Remove obsolete sdk-location on project update, don't
use it as backup location anymore (main_rules.xml won't work with
it anyway).
Remove the old application.package properties since older platforms
will use the new rules anyway.
Change-Id: I5a5ec3d1289cf793dd0f98fb778bd84086976c52
Tor Norbye [Wed, 13 Oct 2010 19:55:21 +0000 (12:55 -0700)]
Make drag and drop create a single undo operation
If you drag and drop a widget, you end up with two separate undo
operations: One which inserts the widget in its new location, and one
which deletes it from its former location. If you drag a widget
somewhere and then change your mind and press Undo, you will therefore
end up with *two* versions of the dragged widgets, since undoing just
once only undoes the source removal, not the target addition.
This changeset fixes this. It's not a very clean fix since drag and
drop is a protocol where the drag source and the drop handler are
deliberately not connected. We now create a single undo context before
calling the layout helper's drop handler, and when it has finished we
then remove the source, still within the current undo context. This is
done by having the drag source register a cleanup handler with the
global drag info object, and this handler is invoked from within the
drop target's undo operation.
This means that we end up creating the undo unit on the tool side
rather than in the layout helpers, where more specific undo labels
were assigned. To deal with this, there is a new function which
produces a suitable Undo name. It creates the name by considering
whether it's a move or copy, as well as the unqualified names of the
dragged element and the drop target. For example, when dragging from
the palette you may end up with "Drop Button in LinearLayout", and if
dragging a multiselection you may end up with "Move Widgets in
RelativeLayout", and so on.
Change-Id: I242b51e5a9c7cd9eae55aa4139c510cb26b0e8fb
The Android Open Source Project [Fri, 15 Oct 2010 18:25:53 +0000 (11:25 -0700)]
merge from open-source master
Change-Id: Ief68e2c0f2aaeadea78d644ede2aad57e27df4f8
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
The Android Open Source Project [Thu, 14 Oct 2010 23:42:42 +0000 (16:42 -0700)]
merge from open-source master
Change-Id: I48e56003e6369b8c2e57d8cfdd19fcd826765b9b
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"
The Android Open Source Project [Thu, 14 Oct 2010 22:40:13 +0000 (15:40 -0700)]
merge from open-source master
Change-Id: I451857d5feae12aad59ab323d9898724450062ac
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
The Android Open Source Project [Thu, 14 Oct 2010 00:47:08 +0000 (17:47 -0700)]
merge from open-source master
Change-Id: I2c170fc3e8903aa2f169216538973add8246d8c2
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
The Android Open Source Project [Wed, 13 Oct 2010 22:43:46 +0000 (15:43 -0700)]
merge from open-source master
Change-Id: If066740b2380fd658c712d1e83215a343f673374
The Android Open Source Project [Wed, 13 Oct 2010 22:26:59 +0000 (15:26 -0700)]
merge from open-source master
Change-Id: Iebdc036d678de9aefd40050cb25ce09939e88913
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
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