OSDN Git Service
Xavier Ducrohet [Mon, 10 Jan 2011 19:13:30 +0000 (11:13 -0800)]
Merge "More fine grained layoutlib Capability for animation support."
Xavier Ducrohet [Sun, 9 Jan 2011 22:21:03 +0000 (14:21 -0800)]
More fine grained layoutlib Capability for animation support.
Make the distinction between playing animation, animating
view insert/delete/move inside the same viewgroup and animating
move across layouts.
Change-Id: Ia9a6e4e53425a66a74ddd39796b04ed8c78d4a5a
Xavier Ducrohet [Fri, 7 Jan 2011 22:14:56 +0000 (14:14 -0800)]
Merge "Fix layout device list."
Raphael Moll [Fri, 7 Jan 2011 21:57:07 +0000 (13:57 -0800)]
Merge "Cleanup ArrayList usage in SDK Manager."
Xavier Ducrohet [Fri, 7 Jan 2011 21:49:49 +0000 (13:49 -0800)]
Fix layout device list.
Change-Id: Idb6b0f654cd11225faceeb5b0541703623a0ee83
Xavier Ducrohet [Fri, 7 Jan 2011 21:48:40 +0000 (13:48 -0800)]
Merge "Remove skins from sdk.git"
Raphael Moll [Fri, 7 Jan 2011 21:48:13 +0000 (13:48 -0800)]
Cleanup ArrayList usage in SDK Manager.
Change-Id: If8e3adec4a23456f5f31be96aa959048a698d225
Raphael Moll [Fri, 7 Jan 2011 08:41:14 +0000 (00:41 -0800)]
SdkManager: suggest which platform to install to fix a broken addon.
The SDK Manager now has the notion of a "broken installed package".
The BrokenPackage can specify that:
- it requires a certain minimal platform to be installed,
and/or:
- it requires a specific exact platform to be installed.
The later constraint is expressed by IExactApiLevelDependency and
allows UpdaterLogic to find which platform would fix an addon which
is missing its base platform.
Change-Id: If429ea39f0ddc19c0cb906bf6766df310de28981
Raphael Moll [Fri, 7 Jan 2011 20:49:23 +0000 (12:49 -0800)]
Merge "SdkManager: suggest which platform to install to fix a broken addon."
Xavier Ducrohet [Fri, 7 Jan 2011 19:37:50 +0000 (11:37 -0800)]
Remove skins from sdk.git
They are now in development.git
Change-Id: I9b8ec2c65892cb7635b6be77a7c8929f62d018b8
Tor Norbye [Fri, 7 Jan 2011 19:37:28 +0000 (11:37 -0800)]
Merge "Fix copyright and clarify silent logger"
Tor Norbye [Fri, 7 Jan 2011 19:26:57 +0000 (11:26 -0800)]
Fix copyright and clarify silent logger
Fix missing header in previous checkin.
Also remove the silent logger from the render() method, and create the
silent logger in the palette preview drag where it's more obvious why
the rendering is quiet.
Change-Id: I80d2be0c40d00589182988262f1d0f2e64ee4dd4
Xavier Ducrohet [Fri, 7 Jan 2011 17:48:52 +0000 (09:48 -0800)]
Merge "Update changelog."
The Android Open Source Project [Fri, 7 Jan 2011 15:16:46 +0000 (07:16 -0800)]
merge from open-source master
Change-Id: Ifc4f16a95242f41faf8b2c37ef5aea8f2b4c14d5
Tor Norbye [Fri, 7 Jan 2011 15:13:23 +0000 (07:13 -0800)]
Merge "Support for editing id, text, string and reference properties"
Tor Norbye [Wed, 5 Jan 2011 22:41:49 +0000 (14:41 -0800)]
Support for editing id, text, string and reference properties
We have context menu items for editing the properties of the currently
selected view, but it is only available for boolean and enumerated
properties.
This changeset makes it possible to edit these properties in three
ways:
1. It adds in all the other properties to the Property context menu,
but instead of pullright menus, the actions have "..." as a suffix,
and when selected will open a dialog asking for the new value.
(This is similar to how custom layout width/height values are
handled.)
If the attribute represents a reference-type, then the Reference
Chooser (also used by the property sheet) is shown, and if not just
a plain text field.
(This context-menu feature was requested by external users.)
2. It adds the "ID" property as a top level item that can be edited
directly via an "Edit ID..." menu item, right next to the "Layout
Width" and "Layout Height" properties which are also special-cased
at the top level.
3. For Views that have a "Text" property, this property is also added
at the top level to be able to set it quickly and conveniently. As
soon as we get inline editing we can consider whether this is still
needed.
In addition, the changeset extracts constants for the various ids used
for action identity, and makes a common function for setting a
particular node attribute.
Change-Id: Ib86a8a5412c39117fe250ce5788d8457a0e3fbe8
The Android Open Source Project [Fri, 7 Jan 2011 15:05:16 +0000 (07:05 -0800)]
merge from open-source master
Change-Id: I9e5cedfe59a747f271cf373f806e5d9ada822b6c
Tor Norbye [Fri, 7 Jan 2011 14:54:39 +0000 (06:54 -0800)]
Merge "Move the "Show Included In" menu item"
Tor Norbye [Wed, 5 Jan 2011 20:24:58 +0000 (12:24 -0800)]
Move the "Show Included In" menu item
The "Show Included In" context menu was grouped as part of the
view-specific actions (setting width, height, orientation,
etc). That's not really a good place since this option is really about
the view as a whole. This changeset moves the item down to the bottom
of the context menu, next to the "Show In" action (which lets you show
the content in another Eclipse view.)
The code was tweaked a bit to be computed lazily (e.g. the contents of
the include list is not computed until the actual Show Included menu
is opened.)
Change-Id: Ic18997271e9ffde491a1a63e337ff015d762a20a
The Android Open Source Project [Fri, 7 Jan 2011 14:42:21 +0000 (06:42 -0800)]
merge from open-source master
Change-Id: I3ff0e78c9ab1596df068921bce7fe92f9a2f9db5
The Android Open Source Project [Fri, 7 Jan 2011 14:29:18 +0000 (06:29 -0800)]
merge from open-source master
Change-Id: Id5239533e7825bd0379b5afb142bb46c8d363f4b
Tor Norbye [Fri, 7 Jan 2011 14:19:46 +0000 (06:19 -0800)]
Merge "Replace Sdk.makeRelativeTo()"
Tor Norbye [Fri, 7 Jan 2011 03:09:06 +0000 (19:09 -0800)]
Replace Sdk.makeRelativeTo()
IPath#makeRelativeTo(IPath) was not supported on Eclipse 3.4, so we
had a local version of it in our sourcebase, as
Sdk#makeRelativeTo(IPath,IPath). However, our version only works
correctly for directories, not plain files, but I had been using it
for files as well.
Now that we no longer need to support Eclipse 3.4, remove our local
version and use the builtin path conversion method.
(Fixed some invalid javadoc too)
Change-Id: I233875e1ecc758eb1ed333686b319b138eb47c4a
Tor Norbye [Fri, 7 Jan 2011 14:14:14 +0000 (06:14 -0800)]
Merge "Accumulate rendering errors and ensure they are always shown"
Tor Norbye [Fri, 7 Jan 2011 04:35:20 +0000 (20:35 -0800)]
Accumulate rendering errors and ensure they are always shown
There are some scenarios where rendering failures (such as an NPE in
the layout lib) will not appear in the error display, and it will not
appear in the Error Log.
In addition, we now get fidelity warnings from the layout library
(warning about Android code using graphics operations not supported by
the layout preview), and these should all be displayed to the user
with a proper explanation.
To solve these problems, this changeset replaces the layout logger
with a new logger which:
(1) Writes all exceptions to the AdtPlug.log(Throwable) method, which
results in the full exception being captured in the Error Log
(2) Accumulates all errors, warnings and fidelity warnings
(3) Provides a summary of ALL the problems at the end, such that they
are all displayed (in decreasing order of severity) for the user
rather than the last one clobbering them all.
The logger also records whether exceptions were logged, and if so, the
last line of the error display indicates that further details can be
found in Window > Show View > Error Log.
Finally, the old logger was a member of the GraphicalEditorPart, but
this is a lightweight object so there is no need to cache it, and in
fact we don't want other types of rendering (such as preview
rendering) popping open the error display area.
Change-Id: Ia00978a725cb7e7ec2dcfbf9e868df2a5136efc0
The Android Open Source Project [Fri, 7 Jan 2011 03:36:29 +0000 (19:36 -0800)]
merge from open-source master
Change-Id: Ifc8965806394560e4dd8da14c1789140998ea51f
Tor Norbye [Fri, 7 Jan 2011 03:27:28 +0000 (19:27 -0800)]
Merge "Fix NON-NLS tokens"
The Android Open Source Project [Fri, 7 Jan 2011 03:23:21 +0000 (19:23 -0800)]
merge from open-source master
Change-Id: Ib519ff7834dfb55894a199ffcfa6f63a6c34764e
Tor Norbye [Fri, 7 Jan 2011 03:19:59 +0000 (19:19 -0800)]
Merge "Improve the Outline contents"
Tor Norbye [Wed, 5 Jan 2011 02:28:43 +0000 (18:28 -0800)]
Improve the Outline contents
1. Make the outline use StyledStrings such that we can use different
colors for different elements in the outline. Use the decorations
color for the element type that follows the id.
2. For elements that define a "text" property, include the text (or a
prefix of it if it is long) in the outline. Thus, for a Button you
might see something like "Button01 - "Submit Order").
3. For elements that define a "src" property, show the
source. Therefore, for an ImageView you might see "ImageView - logo".
4. For <include> elements, show the name of the included layout.
Change-Id: Ibd4c8339ea0e03c969ccaec1a67bc64436ed67af
Xavier Ducrohet [Fri, 7 Jan 2011 02:02:13 +0000 (18:02 -0800)]
Update changelog.
Change-Id: I8ac24138cbf8bfc6d9dd44aaa1fde4d8485d8416
The Android Open Source Project [Fri, 7 Jan 2011 01:01:25 +0000 (17:01 -0800)]
merge from open-source master
Change-Id: I570f71a2e5550a8f1558f9fc83b4ee1321e703a6
Raphael Moll [Fri, 7 Jan 2011 00:51:53 +0000 (16:51 -0800)]
Merge "Support broken addons in SDK Manager UI."
Tor Norbye [Fri, 7 Jan 2011 00:49:10 +0000 (16:49 -0800)]
Merge "Add "Extract As Include" refactoring"
Tor Norbye [Tue, 4 Jan 2011 05:35:41 +0000 (21:35 -0800)]
Add "Extract As Include" refactoring
Add an "Extract As Include" action to the context menu which lets you
extract a set of selected views and move them into a separate layout
file of their own, and insert an <include> reference to the new view
in place.
You can select multiple items as well (provided they are adjacent
siblings) and in that case the newly extracted layout will use the
<merge> tag as the root element.
This changeset also adds a name validator for resource names, used
both in the new-name entry field for extracted include layouts, as
well as in the New XML File wizard. It enforces that the name (except
for the .xml suffix) is a valid Java identifier name (since otherwise
the R file will have compilation errors.)
This changeset also extracts various inlined String constants like
"xmlns", "android" (as used in namespace prefixes), "@id/" etc and
replaces them with constants.
Change-Id: I3eca8b6afd23f22ca9299ff22c614b4ffd3299bf
Raphael Moll [Sun, 2 Jan 2011 21:36:40 +0000 (13:36 -0800)]
Support broken addons in SDK Manager UI.
Change-Id: Idec7365e440e865a8225ed6f0c9c156206141d73
The Android Open Source Project [Thu, 6 Jan 2011 23:18:41 +0000 (15:18 -0800)]
merge from open-source master
Change-Id: Ib4cf580d21187f0b40507eb489ad5ec973d740d8
Raphael Moll [Thu, 6 Jan 2011 23:16:05 +0000 (15:16 -0800)]
Merge "SDK Manager: specify proxy on no-UI command-line."
Raphael Moll [Thu, 6 Jan 2011 19:12:53 +0000 (11:12 -0800)]
SDK Manager: specify proxy on no-UI command-line.
This adds 2 flags to specify the http/https proxy host/port on
the command line when using the console-base "no-ui" SDK update.
The command-line proxy values override settings if defined.
Also revamped the argument help display to support larger
command-line long argument sizes and mandate that arguments
can have one of ther short or long argument name optional.
Change-Id: I87cc535ab369602a5c02c7a938b0e4f4736c0040
The Android Open Source Project [Thu, 6 Jan 2011 22:11:48 +0000 (14:11 -0800)]
merge from open-source master
Change-Id: I840be1659f7c6230a550c6ace00aae4c23b574be
Tor Norbye [Thu, 6 Jan 2011 22:03:40 +0000 (14:03 -0800)]
Merge "Support for included and merged views"
Tor Norbye [Wed, 22 Dec 2010 23:44:00 +0000 (15:44 -0800)]
Support for included and merged views
We have support in the layout library for handling included views
where the include tag is associated with the root elements rendered in
that included view.
However, there are various scenarios where this is not adequate:
1) including <merge> views (see issue 13288)
2) older layout libraries
This changeset fixes the above scenarios, as well as an additional
scenario (where rendering included content in an outer layout did not
work properly if the included elements were not at the root level).
It does this by moving the CanvasViewInfo construction into a set of
factory methods which handle various different hierarchy types of
ViewInfos. ViewInfos with null keys at the top are handled one way;
ViewInfo subtrees that introduce null keys further down are handled
another, and it attempts to match up elements in the UiViewElementNode
hierarchy with ViewInfo objects. If it cannot match them one to one,
it will create a single "bounding box" view containing all unmatched
ViewInfos. This will for example produce a single box out of included
<merge> views.
This changeset also handles multiple includes. The "overlay mask"
could earlier only handle a single include whereas the rewritten code
can handle multiple "holes" in the mask by computing the set of
subrectangles remaining after punching out the include holes.
Change-Id: I163413c7fc301f25c4523b0ee03690f983a05322
The Android Open Source Project [Thu, 6 Jan 2011 18:17:47 +0000 (10:17 -0800)]
merge from open-source master
Change-Id: Iaa3a08abf878cba80952bd087860896e221820ee
Raphaël Moll [Thu, 6 Jan 2011 18:10:39 +0000 (10:10 -0800)]
Merge "Load and apply proxy settings from config file in UpdateNoWindow, allowing headless updates to work behind a proxy."
Raphaël Moll [Thu, 6 Jan 2011 18:10:27 +0000 (10:10 -0800)]
Merge "Set 'https' proxy system properties using the 'http' settings, allowing downloads via an HTTPS proxy to work."
The Android Open Source Project [Thu, 6 Jan 2011 17:39:58 +0000 (09:39 -0800)]
merge from open-source master
Change-Id: I2ef5cfe972c68a8579b23d2f6960bf4456e1b06f
Xavier Ducrohet [Thu, 6 Jan 2011 17:38:34 +0000 (09:38 -0800)]
Merge "For title bar refresh when changing layout file in same editor."
Xavier Ducrohet [Tue, 4 Jan 2011 14:38:45 +0000 (06:38 -0800)]
For title bar refresh when changing layout file in same editor.
Bug: http://code.google.com/p/android/issues/detail?id=13230
Change-Id: Ib9211a2512a47ba87f1ceceb97c86a47579a8872
Xavier Ducrohet [Thu, 6 Jan 2011 17:37:15 +0000 (09:37 -0800)]
Merge "Fix NPE in layout lib legacy conversion for empty layouts."
Xavier Ducrohet [Thu, 6 Jan 2011 17:37:11 +0000 (09:37 -0800)]
Merge "Add log to layout lib init method."
Christopher Orr [Wed, 5 Jan 2011 16:38:15 +0000 (17:38 +0100)]
Load and apply proxy settings from config file in UpdateNoWindow, allowing headless updates to work behind a proxy.
Change-Id: I0deb8981c5fec0c7ae3eddbbde529537c02fdc1c
Christopher Orr [Wed, 5 Jan 2011 16:32:20 +0000 (17:32 +0100)]
Set 'https' proxy system properties using the 'http' settings, allowing downloads via an HTTPS proxy to work.
Change-Id: I95fd0f377df4ff4372e8a7ca18cfc4195bbfc177
Tor Norbye [Tue, 4 Jan 2011 23:59:49 +0000 (15:59 -0800)]
Fix NON-NLS tokens
There were a number of // $NON-NLS-1$ references in the codebase.
Eclipse's "Externalize Strings" functionality will not handle these
correctly; there must not be a space between the "//" and the "$NON"
tokens.
(I left AndroidXmlEditor.xml alone; it is the file I discovered
the problem in but I fixed those references as part of another
pending checkin.)
Change-Id: If185c88a667273af614f0bee5959fd2618756c05
The Android Open Source Project [Tue, 4 Jan 2011 17:49:31 +0000 (09:49 -0800)]
merge from open-source master
Change-Id: I4c8dd41a68077f3ea1787bcd7c73ed0c40fe4d28
Tor Norbye [Tue, 4 Jan 2011 17:38:09 +0000 (09:38 -0800)]
Merge "New XML Wizard fixes"
The Android Open Source Project [Tue, 4 Jan 2011 11:56:28 +0000 (03:56 -0800)]
merge from open-source master
Change-Id: Ic384d9d566a27ded89107ed3ae938dbd5564f987
Xavier Ducrohet [Tue, 4 Jan 2011 11:49:02 +0000 (03:49 -0800)]
Merge "use UTF-8 instead of ISO-8859-1"
Xavier Ducrohet [Tue, 4 Jan 2011 11:29:48 +0000 (03:29 -0800)]
Fix NPE in layout lib legacy conversion for empty layouts.
Change-Id: I23a87efb586d02d571118a6f9e49628fc850d8cb
The Android Open Source Project [Tue, 4 Jan 2011 06:17:55 +0000 (22:17 -0800)]
merge from open-source master
Change-Id: I437e96e500a433b846ca09148970e2e16738b0d8
Raphael Moll [Tue, 4 Jan 2011 06:08:41 +0000 (22:08 -0800)]
Merge "Minor method rename in SdkManager UI."
Raphael Moll [Fri, 31 Dec 2010 01:18:08 +0000 (17:18 -0800)]
Minor method rename in SdkManager UI.
Change-Id: I35447fe1ae9a21763207a07c0e205c1808f3b420
Raphael Moll [Tue, 4 Jan 2011 06:05:34 +0000 (22:05 -0800)]
Merge "Move Pair<,> from ADT to SdkLib.utils"
Raphael Moll [Fri, 31 Dec 2010 01:14:56 +0000 (17:14 -0800)]
Move Pair<,> from ADT to SdkLib.utils
Change-Id: I5c37e4b4dd83bc239ed242709ede70982f14705f
The Android Open Source Project [Tue, 4 Jan 2011 06:05:22 +0000 (22:05 -0800)]
merge from open-source master
Change-Id: Idbc86de2d487d992b7a44e5831f539b520a8e9cb
Raphael Moll [Tue, 4 Jan 2011 06:02:02 +0000 (22:02 -0800)]
Merge "SDK Manager in ADT: make it possible to unload the SDK."
Raphael Moll [Thu, 30 Dec 2010 00:47:35 +0000 (16:47 -0800)]
SDK Manager in ADT: make it possible to unload the SDK.
One of the issues when using the SDK Manager from Eclipse
is that, at least on Windows, we can't upgrade the platform-tools
or the targets since they might be locked by ADT.
Typically dex.jar is in use and typically we have various data/res
(ttf and xml) files used by any opened layout editor.
This adds the necessary infrastructure to know in ADT when
packages are going to be installed. There's a crude attempt to
solve the dex.jar issue. However unloading the targets isn't
done yet.
Change-Id: I5c48144501c7f39ef779bfeffdfae85a48c65a29
Raphael Moll [Tue, 4 Jan 2011 05:57:10 +0000 (21:57 -0800)]
Merge "SDK Manager: Rework install logic."
Raphael Moll [Wed, 29 Dec 2010 22:57:38 +0000 (14:57 -0800)]
SDK Manager: Rework install logic.
This should get rid of the annoying behavior on Windows
that prevent the "folder swap" operation due to the folders
being locked. Cf public issue 4410.
High level summary of the issue and the fix: the old behavior
was to unzip in a temp folder, then rename the old folder to
another temp file and finally rename the new folder at the
desired location. This fails typically when there is a file
indexer (e.g. anti-virus) scanning the new folder so we can't
move that folder.
The new logic is to try to move the old folder first into a
temp folder. If the fail move, we have a lock on the old folder
and ask the user to fix it manually. They probably have a file
opened and it's a legit issue to report. Once that succeeded
we can directly unzip the archive into the final destination
without using a temp unzip location, thus avoiding the common
"indexer in progress" issue.
In case the unzip operation fails, we try to copy (not move) the
old folder back.
Change-Id: I5ed67ff626532fe7cc48a45e87d1dbaf6954f28a
The Android Open Source Project [Tue, 4 Jan 2011 05:52:49 +0000 (21:52 -0800)]
merge from open-source master
Change-Id: If53238c5fa612f78ffd77025c0580014aa6551c2
Raphael Moll [Tue, 4 Jan 2011 05:48:30 +0000 (21:48 -0800)]
Merge "SDK Manager: Split install logic out of the Archive class."
Raphael Moll [Wed, 29 Dec 2010 04:12:55 +0000 (20:12 -0800)]
SDK Manager: Split install logic out of the Archive class.
Change-Id: I669229ad6d8906ca654c9be5e3416360cc7a5fb5
Raphael Moll [Tue, 4 Jan 2011 05:38:56 +0000 (21:38 -0800)]
Merge "Fix android.bat to properly cd to temp dir."
The Android Open Source Project [Mon, 3 Jan 2011 21:01:16 +0000 (13:01 -0800)]
merge from open-source master
Change-Id: Ic7cc97020bef31c85cc5a6557dbbbc373e4962e5
Tor Norbye [Mon, 3 Jan 2011 20:48:57 +0000 (12:48 -0800)]
Merge "Replace hand-written mocking classes with EasyMock calls"
Xavier Ducrohet [Mon, 3 Jan 2011 12:06:39 +0000 (04:06 -0800)]
Add log to layout lib init method.
Change-Id: I28efe429925a77fd10b76bb54519ae9d42900e52
Tor Norbye [Sat, 1 Jan 2011 20:34:26 +0000 (12:34 -0800)]
New XML Wizard fixes
1. Make the LinearLayout default width and height values be
match_parent for Android 2.x and up, fill_parent for older. This
fixes issue 13481: ADT creates layout resources with fill_parent
instead of match_parent
2. Give the Name field initial focus rather than the Project field,
since you usually don't want to edit the Project field and more than
once I've accidentally edited the project name instead.
3. Don't require the user to manually type ".xml" as a suffix since
it's required anyway. If you type "foo", it will create "foo.xml". You
can however type "foo.xml" (and you cannot type any other extensions.)
Change-Id: Ibd03bb73e283b02991662de6ab889f647554b7d6
Tor Norbye [Thu, 30 Dec 2010 06:01:16 +0000 (22:01 -0800)]
Replace hand-written mocking classes with EasyMock calls
This changeset removes the various hand-written mock implementations
of key Eclipse interfaces (IProject, IFile, IFolder, etc) and replaces
them with EasyMock proxy objects.
This makes our codebase buildable on Eclipse 3.6+.
(Also fix a couple of test warnings for abstract testcase classes
which were missing tests)
Change-Id: I70553ab95dc9386da1c7eed139d3ef587d929478
The Android Open Source Project [Wed, 29 Dec 2010 20:42:35 +0000 (12:42 -0800)]
merge from open-source master
Change-Id: Ifcf644143119c26e5a3cbd6f425c484bcb1fec1f
Tor Norbye [Wed, 29 Dec 2010 20:31:38 +0000 (12:31 -0800)]
Merge "Prevent adding children into AdapterViews"
The Android Open Source Project [Wed, 29 Dec 2010 20:31:02 +0000 (12:31 -0800)]
merge from open-source master
Change-Id: I326f83d999100341c58733d33695684a8ca35a81
Tor Norbye [Tue, 28 Dec 2010 19:50:49 +0000 (11:50 -0800)]
Prevent adding children into AdapterViews
As reported in issue 13042, it's possible to add views into
AdapterViews such as ListView. This causes a rendering error.
The root issue is that we were relying on
ElementDescriptor#hasChildren() to determine whether a particular view
is willing to accept children, but that isn't entirely correct, since
all subclasses of AdapterView (such as ListView, Spinner, etc) will
throw an exception if you do that.
To fix this, I've added a new method to DescriptorUtils,
"canInsertChildren", which performs additional checking beyond
hasChildren(). If it has an actual view object, it will walk up the
super class chain and see if the view extends AdapterView, and if no
view object is available, it will filter out the known subclasses of
AdapterView (well, it doesn't have to filter out Spinner since that
class doesn't report that it has children).
Change-Id: I663b18fcfbe97a10c8f1aaa2d75552fb8fb148d5
Tor Norbye [Wed, 29 Dec 2010 20:27:17 +0000 (12:27 -0800)]
Merge "Fix error in include cycle detection"
Tor Norbye [Fri, 24 Dec 2010 02:56:56 +0000 (18:56 -0800)]
Fix error in include cycle detection
The code to detect cycles in include dependencies was wrong; it would
incorrectly identify some valid DAGs as having a cycle. We don't
necessarily have a cycle just because we encounter a node we've
already seen; it is only a cycle if we encounter a vertex that we are
currently visiting further back in the depth-search.
Change-Id: I3149c80d54258e6fff4cb0a0b1a3cefcb1db56f2
The Android Open Source Project [Wed, 29 Dec 2010 04:22:58 +0000 (20:22 -0800)]
merge from open-source master
Change-Id: I0be6edc6aa558e63aa786ccad92fe2419baa267d
Raphael Moll [Wed, 29 Dec 2010 04:16:52 +0000 (20:16 -0800)]
Merge "Fix NPE when deleting a layout resource file."
Raphael Moll [Sat, 18 Dec 2010 08:37:27 +0000 (00:37 -0800)]
Fix NPE when deleting a layout resource file.
The IncludeFinder tries to read the file, but the workspace
is not in sync so although the resource exists in the
workspace there is no XML file to read anymore.
Change-Id: If0ca5cca8e6978f1777531d6413d7c30a54c9d7d
Raphael Moll [Wed, 29 Dec 2010 00:16:28 +0000 (16:16 -0800)]
Fix android.bat to properly cd to temp dir.
Fixes an issue when the SDK is not on the same drive
than the temp dir that android.bat uses.
Reported on http://code.google.com/p/android/issues/detail?id=4410
Change-Id: I993ea550056bda2c696c28bfa135aa186aad7a05
The Android Open Source Project [Tue, 28 Dec 2010 20:58:36 +0000 (12:58 -0800)]
merge from open-source master
Change-Id: I1ff2bb98446bc6272fd3c4f6a550de38dcb2b50e
Raphael Moll [Tue, 28 Dec 2010 20:52:30 +0000 (12:52 -0800)]
Merge "Enable code specific to Eclipse 3.5"
Raphael Moll [Tue, 28 Dec 2010 20:52:22 +0000 (12:52 -0800)]
Merge "Enable code specific to Eclipse 3.5"
The Android Open Source Project [Tue, 28 Dec 2010 20:10:49 +0000 (12:10 -0800)]
merge from open-source master
Change-Id: I9f20bd3690e367bd41523bca6ccc42cfa2405823
Tor Norbye [Tue, 28 Dec 2010 20:05:22 +0000 (12:05 -0800)]
Merge "Improve custom class loading failure handling"
The Android Open Source Project [Tue, 28 Dec 2010 18:24:55 +0000 (10:24 -0800)]
merge from open-source master
Change-Id: I31f069bc3e50c895162d15b4d0d5851a4d380fda
Raphael Moll [Tue, 28 Dec 2010 00:37:42 +0000 (16:37 -0800)]
Enable code specific to Eclipse 3.5
Change-Id: I29f6d1d74ce2979882988c18bc3e79d995445015
Raphael Moll [Tue, 28 Dec 2010 00:35:31 +0000 (16:35 -0800)]
Enable code specific to Eclipse 3.5
Change-Id: Ib750dab8839f919474fd6e92b9960f14d355e4ca
Raphael Moll [Fri, 24 Dec 2010 19:56:00 +0000 (11:56 -0800)]
Merge "Add readme regarding move of adb to platform-tools"
Tor Norbye [Fri, 24 Dec 2010 01:32:12 +0000 (17:32 -0800)]
Improve custom class loading failure handling
For background, see
http://code.google.com/p/android/issues/detail?id=13389
We currently both load and instantiate custom view classes under the
same try/catch block, and if there is a failure, the user is informed
that the class could not be -found-. However, in many cases the real
failure is in actually -instantiating- the class, so telling the user
that the class could not be found is misleading and can make the user
hunt down library dependencies, checking jar contents, etc.
This changeset improves the situation in the following ways:
- The code to load and instantiate are handled separately, and the
list of missing classes is kept separate from the list of
uninstantiatable classes.
- The error display in the layout editor lists these two categories
separately.
- For instantiation errors, we dig up the root cause and log that
one. The error display points to the Error Log for more details.
- If the class looks like it might be a custom view class (rather than
a loading or instantiation failure in one of the Android or Add-Ons
classes) then the error message also includes a tip about using
View.isInEditMode to try to do less work for design time rendering.
Change-Id: I947ad91e0d7973e9c3aefed1824f61c92c5fb1ed
Raphael Moll [Thu, 23 Dec 2010 19:00:07 +0000 (11:00 -0800)]
Add readme regarding move of adb to platform-tools
Change-Id: I861a1b02a3abb1bb1f9120bbd25f3d4ffd949e9e
Raphael Moll [Thu, 23 Dec 2010 18:52:05 +0000 (10:52 -0800)]
Merge "Switch Eclipse Plugin build to Eclipse 3.5.2 RCP"
The Android Open Source Project [Thu, 23 Dec 2010 15:23:51 +0000 (07:23 -0800)]
merge from open-source master
Change-Id: I20d1868bdca64578e561b9bb2da36dc01e411cb2