OSDN Git Service
Raphael Moll [Wed, 27 Oct 2010 17:05:54 +0000 (10:05 -0700)]
ADT: Fix display of unknown Manifest elements.
SDK Bug:
3135772
Change-Id: I4f7c84c20b31e70db20a202f168158d500b3c09d
Raphael Moll [Wed, 27 Oct 2010 05:20:16 +0000 (22:20 -0700)]
Merge "ADT: Exclude <include> tag from the GLE palette." into tools_r8
Raphael Moll [Tue, 26 Oct 2010 23:18:45 +0000 (16:18 -0700)]
ADT: Exclude <include> tag from the GLE palette.
Change-Id: Ia318556bc88a823fb6eae9048634c824524f3b90
Raphael Moll [Tue, 26 Oct 2010 18:21:13 +0000 (11:21 -0700)]
Merge "SDK: Fixed proguard.bat & co." into tools_r8
Raphael Moll [Tue, 26 Oct 2010 18:21:07 +0000 (11:21 -0700)]
Merge "ADT: fixes to make Proguard work under Windows." into tools_r8
Raphael Moll [Mon, 25 Oct 2010 21:27:23 +0000 (14:27 -0700)]
SDK: Fixed proguard.bat & co.
These are similar to the external/proguard/bin/*.bat
except they use $SDK/tools/lib/find_java.bat to locate the
java location and use it if available. find_java will print
a proeminent error if java cannot be found.
Change-Id: I1fceae838436053031f405de9b3f1ab2d64222e6
Raphael Moll [Mon, 25 Oct 2010 20:28:07 +0000 (13:28 -0700)]
ADT: fixes to make Proguard work under Windows.
- the proguard.bat can only pass 9 args, but we have 15+, so
we'll use a temporary proguard config file for Windows.
- PROGUARD_HOME needs to be defined properly since the default
proguard.bat cannot infer it properly. We need other fixes
to that batch file so eventually we're not going to ship the
default one and we can fix the .bat file, but properly defining
this env var is probably a good idea anyway.
Change-Id: Id007d5504a5e05d1c4b5a0728e96e0d677978ef4
Xavier Ducrohet [Mon, 25 Oct 2010 22:20:52 +0000 (15:20 -0700)]
Merge "Fix external jar support when building with proguard." into tools_r8
Xavier Ducrohet [Mon, 25 Oct 2010 21:24:09 +0000 (14:24 -0700)]
Fix external jar support when building with proguard.
Change-Id: I3dafb284770f475d70a212cbe22cdae6bff36ff7
Xavier Ducrohet [Fri, 22 Oct 2010 17:54:16 +0000 (10:54 -0700)]
Merge "Remove temporary disabling of proguard during ADT export." into tools_r8
Xavier Ducrohet [Fri, 22 Oct 2010 17:53:21 +0000 (10:53 -0700)]
Remove temporary disabling of proguard during ADT export.
Change-Id: Iadff55b838b7317f9dcc518d5246a2889f7a5f39
Xavier Ducrohet [Fri, 22 Oct 2010 01:20:48 +0000 (18:20 -0700)]
Merge "Workaround failure to collect test info for large test suites." into tools_r8
Xavier Ducrohet [Wed, 20 Oct 2010 20:24:06 +0000 (13:24 -0700)]
Merge "Integrate
6db57208 into tools_r8. DO NOT MERGE." into tools_r8
Xavier Ducrohet [Wed, 20 Oct 2010 20:23:48 +0000 (13:23 -0700)]
Merge "Integrate
5397067d into tools_r8. DO NOT MERGE." into tools_r8
Xavier Ducrohet [Wed, 20 Oct 2010 20:23:41 +0000 (13:23 -0700)]
Merge "Integrate
17398174 into tools_r8. DO NOT MERGE." into tools_r8
Bill Napier [Mon, 18 Oct 2010 07:00:20 +0000 (00:00 -0700)]
Integrate
6db57208 into tools_r8. DO NOT MERGE.
Initial cut at MonkeyRecorder.
MonkeyRecorder (and MonkeyPlayback) are a set of tools for using MonkeyRunner to record and playback actions. The current implementation is not very sophisticated, but it works.
Please don't review yet. Needs a lot of style cleanup.
Change-Id: I79ed1b548d295563a184af5fb945140f93586b17
Bill Napier [Sun, 17 Oct 2010 22:47:04 +0000 (15:47 -0700)]
Integrate
5397067d into tools_r8. DO NOT MERGE.
Fix field visibility by ensuring they stay in __dict__.
Change-Id: I2e93dd4ba8c8cc3f05ca477091932268ec5d78da
Bill Napier [Mon, 18 Oct 2010 20:42:29 +0000 (13:42 -0700)]
Integrate
17398174 into tools_r8. DO NOT MERGE.
Make MonkeyRunner's adb finding more robust.
This includes fixes for running out of the SDK.
Change-Id: Ie73ccd391b34f8a75f23738a97c42902f91af841
Xavier Ducrohet [Wed, 20 Oct 2010 20:06:40 +0000 (13:06 -0700)]
Merge "Gen folder should not be derived." into tools_r8
Xavier Ducrohet [Wed, 20 Oct 2010 18:51:59 +0000 (11:51 -0700)]
Gen folder should not be derived.
This fix the issue where gen is not present after project
creation (it was actually created then deleted as part of a clean
up phase)
Change-Id: I25cd67c076ed401b482d97292640c08a2a7a5830
Brett Chabot [Wed, 20 Oct 2010 03:02:52 +0000 (20:02 -0700)]
Workaround failure to collect test info for large test suites.
Add a small delay between tests when collecting test info.
Bug
1796494
Change-Id: I57061d7a21f8c8517c03101e28a3de82cdd61cd8
Xavier Ducrohet [Tue, 19 Oct 2010 20:07:31 +0000 (13:07 -0700)]
Merge "Integrate
9174add7 into tools_r8. DO NOT MERGE" into tools_r8
Xavier Ducrohet [Tue, 19 Oct 2010 20:07:15 +0000 (13:07 -0700)]
Merge "Integrate
5b6aa7d0 into tools_r8. DO NOT MERGE." into tools_r8
Raphael Moll [Tue, 19 Oct 2010 19:08:26 +0000 (12:08 -0700)]
Integrate
9174add7 into tools_r8. DO NOT MERGE
SDK Manager fix: message to restart after tools update.
The latest CL made this appear after a platform-tools update instead.
Change-Id: Ib52cf88adfb1557c112c3a8153dad536c5932fa3
Raphael Moll [Tue, 19 Oct 2010 19:00:07 +0000 (12:00 -0700)]
Integrate
5b6aa7d0 into tools_r8. DO NOT MERGE.
SDK Manager: addon schema version number in about box.
Change-Id: I35d4e1db042282e269e3d1247d36ffa0e44291d5
Xavier Ducrohet [Tue, 19 Oct 2010 00:46:33 +0000 (17:46 -0700)]
Merge "Integrate
13f4bf0d into Tools_r8. DO NOT MERGE." into tools_r8
Tor Norbye [Mon, 18 Oct 2010 23:19:01 +0000 (16:19 -0700)]
Integrate
13f4bf0d into Tools_r8. DO NOT MERGE.
Fix bug in LinearLayout handling of last lines
This fixes a bug where the insert-line for the last position is not
always *drawn* (the suggestion was there and the feedback rectangle
would snap to it, but the dashed line was not painted because the code
to suppress self-dragging was interfering.)
Change-Id: I853ef51a5a160f151119b7c819a3715cbde98b5a
Xavier Ducrohet [Tue, 19 Oct 2010 00:06:42 +0000 (17:06 -0700)]
Merge "Integrate
11357696 into tools_r8. DO NOT MERGE" into tools_r8
Xavier Ducrohet [Tue, 19 Oct 2010 00:06:26 +0000 (17:06 -0700)]
Merge "Integrate
3c36e33f into tools_r8. DO NOT MERGE." into tools_r8
Raphael Moll [Mon, 18 Oct 2010 23:16:09 +0000 (16:16 -0700)]
Integrate
11357696 into tools_r8. DO NOT MERGE
SDK Manager: Restart ADB after platform-tools update.
Change-Id: Ie59201a3f303e1a9a837e82cbf4a83f620b4e7f2
snpe [Sun, 17 Oct 2010 16:34:51 +0000 (18:34 +0200)]
Integrate
3c36e33f into tools_r8. DO NOT MERGE.
Fixing Issue 11557: SWTError: No more handles exception on Eclipse
Change-Id: Ie5e7d8af8ef0376cd4d3e9afcfdd328c331a5d96
Tor Norbye [Mon, 18 Oct 2010 22:01:48 +0000 (15:01 -0700)]
Merge "Set hover fill color"
Xavier Ducrohet [Mon, 18 Oct 2010 21:57:49 +0000 (14:57 -0700)]
Merge "DexWrapper is now loaded by the SDK instead of the platforms."
Xavier Ducrohet [Mon, 18 Oct 2010 21:42:19 +0000 (14:42 -0700)]
Merge "Updated changelog for ADT."
Xavier Ducrohet [Mon, 18 Oct 2010 20:48:08 +0000 (13:48 -0700)]
DexWrapper is now loaded by the SDK instead of the platforms.
Since tools_r8, dx.jar is now located in platform-tools. instead
of platforms/android-<API>/tools/lib/.
There is therefore no need for all the platforms to load their
own dx.jar through reflection into DexWrapper. The SDK now does it
for all, and the builders query the SDK for the wrapper.
Change-Id: Ia79ccaf95237f2b25b43f26241e6335acc7050a3
Xavier Ducrohet [Mon, 18 Oct 2010 21:35:24 +0000 (14:35 -0700)]
Merge "Missing platform toosl doesn't mean the SDK is invalid."
Xavier Ducrohet [Mon, 18 Oct 2010 21:22:33 +0000 (14:22 -0700)]
Updated changelog for ADT.
Change-Id: I523c4ecf9c037410d23c28bf5ce778f3e3d032b7
Tor Norbye [Mon, 18 Oct 2010 18:56:07 +0000 (11:56 -0700)]
Set hover fill color
The code which paints the hover didn't actually set the hover fill color
on the graphics context so it was just blending with white. This happens
to be the color the fill was initialized to so the problem wasn't
noticeable.
Change-Id: I95f0eface23f2a772b687ba348997a3eac2d85a9
Xavier Ducrohet [Mon, 18 Oct 2010 18:49:55 +0000 (11:49 -0700)]
Missing platform toosl doesn't mean the SDK is invalid.
Change-Id: I623edf5df8bcc9b0b1f806c49e863879fcd4fda4
Raphael Moll [Mon, 18 Oct 2010 17:25:05 +0000 (10:25 -0700)]
Merge "SDK Manager: refuse to not install dependencies."
Raphael Moll [Sat, 16 Oct 2010 05:11:20 +0000 (22:11 -0700)]
SDK Manager: refuse to not install dependencies.
In the case the SDK Manager found a package that would fix
a broken dependency of the currently installed packages
(e.g. user has Tools but not Platform-Tools), it will refuse
to not install the package that would fix that dependency.
Bug:
3092907
Change-Id: Iea21c69d726b7c859bfbbffc74ba61b690c4afe0
Raphael Moll [Fri, 15 Oct 2010 23:38:49 +0000 (16:38 -0700)]
Merge "Fix typo in precompiler builder."
Raphael Moll [Fri, 15 Oct 2010 22:32:40 +0000 (15:32 -0700)]
Fix typo in precompiler builder.
Bug:
3102564
Change-Id: I44d60fc89e91eadf55c4f5451493f33ec5e13c73
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."
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
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."
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
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