OSDN Git Service
The Android Open Source Project [Wed, 15 Dec 2010 21:16:40 +0000 (13:16 -0800)]
merge from open-source master
Change-Id: I33a34fdbdba39fdfdc75c0fff13d5bbf3884a0aa
Raphael Moll [Wed, 15 Dec 2010 21:00:07 +0000 (13:00 -0800)]
Merge "Fix DDMS and HierarchyViewer .bat files on Windows"
Raphael Moll [Wed, 15 Dec 2010 20:51:26 +0000 (12:51 -0800)]
Fix DDMS and HierarchyViewer .bat files on Windows
These were not setting the "bin dir" properpty correctly,
and as a consequence the tools complain they can't find adb.exe.
The fix is to set it to the directory of the script but to
avoid spaces-in-path issues we use the "~fs" modifier to get
a space-free short name for the %cd% value. And since we can't
use use %cd% combined with ~fs, we use a for loop trick to set it.
Note that ddms.bat was in unix end-of-line mode so I changed it
back to DOS end-of-line mode.
Change-Id: Ic9e55643b551898043add27c12193a0949f40bb0
The Android Open Source Project [Wed, 15 Dec 2010 15:25:20 +0000 (07:25 -0800)]
merge from open-source master
Change-Id: I4a66e7dd2d80488d3743fc4cfb022367aa1ba521
Tor Norbye [Wed, 15 Dec 2010 15:12:09 +0000 (07:12 -0800)]
Merge "Fix model locking"
Tor Norbye [Wed, 15 Dec 2010 05:42:43 +0000 (21:42 -0800)]
Fix model locking
Fix the bug where editors sometimes can't be reopened due to an
assertion in the XML model. The IncludeFinder code I added last week
had a mismatch between the type of lock acquired (an edit lock) and
the lock released (a read lock).
Change-Id: I2d3053ec4e9d1efba62ab0f3216d15f738192ddd
The Android Open Source Project [Wed, 15 Dec 2010 03:40:40 +0000 (19:40 -0800)]
merge from open-source master
Change-Id: Ic03e782d4a53c1ab8c450bf44f85b5b236f85873
Tor Norbye [Wed, 15 Dec 2010 03:33:41 +0000 (19:33 -0800)]
Merge "Remove some actions before milestone"
Tor Norbye [Tue, 14 Dec 2010 16:22:59 +0000 (08:22 -0800)]
Remove some actions before milestone
The Show Include facility doesn't work properly until we backport
layoutlib to all the 2.x SDK layoutlibs. The Play Animation test
isn't yet productized.
Change-Id: Ib4cd0f0cff029fe23ffaca72a96561a0d748f86f
The Android Open Source Project [Wed, 15 Dec 2010 01:13:37 +0000 (17:13 -0800)]
merge from open-source master
Change-Id: If4bb9fa79b1e2dcec0e3f70a18a9dbba303d19ab
Tor Norbye [Wed, 15 Dec 2010 01:11:40 +0000 (17:11 -0800)]
Merge "Only allow drag images for canvas drags"
Tor Norbye [Wed, 15 Dec 2010 00:30:29 +0000 (16:30 -0800)]
Only allow drag images for canvas drags
The outline view "reuses" the drag source listener for the canvas,
doing some tricks with mouse events to make it look like the drag is
originating within the canvas. However, the image previews of drags do
not work well in this case. Therefore, stash data on the drag souce
such that the drag source handler can only do image previews when the
drag source is really the canvas instead of the outline page.
Change-Id: I919264f001fa232053a0b9831ebc32ee22beb877
Tor Norbye [Wed, 15 Dec 2010 00:42:17 +0000 (16:42 -0800)]
Merge "Set layout editor scrollbar increments"
Tor Norbye [Wed, 15 Dec 2010 00:42:01 +0000 (16:42 -0800)]
Merge "Various layout fixes"
Tor Norbye [Tue, 14 Dec 2010 23:30:53 +0000 (15:30 -0800)]
Set layout editor scrollbar increments
Fix 13097: Gingerbread Layout Editor scroll bar bugs, part 1:
Set the layout editor scrollbar increments to 20 (they were 1, meaning
that each click on the scrollbar down button would scroll the view by
one pixel rather than a "chunk" like 20).
Set the scrollbar page increment to the visual height of the
canvas. This means that if you click below the visible range in the
scrollbar it will jump a full scrollbar increment, as expected.
(This is the first half of 13097. The second half deals with something
unrelated.)
Change-Id: I80c544b749d08d1fdc127d682ef8a75aed9aa8e7
Tor Norbye [Tue, 14 Dec 2010 15:15:01 +0000 (07:15 -0800)]
Various layout fixes
First, fix absolute layout such that it properly handles both screen
scaling as well as various screen resolution densities when it
computes the dip positions.
Second, pass the bounds surrounding the mouse position when a drag is
initiated to the view rules. This is used by both absolute layout and
relative layout to properly handle dragging bounds. In particular, in
relative layout this is used to match a border not only when the mouse
cursor gets near the edge, but when the bound edges also get near the
edge. In absolute layout this is used to show a correct bound
rectangle that has the proper offset from the original drag position
(which may not be the center, which until now it was assuming).
Third, in RelativeLayout, when there are no children, offer a left
alignment regardless of where you are within the rectangle. This is
similar to how LinearLayout works.
In addition, two internal changes:
* Factor the various RelativeLayout string constants into the
LayoutConstants class. This had the nice side effect of revealing a
typo where we were referencing a non-existing value! Constants FTW!
* Make the RulesEngine log the exceptions, not just the error
messages, thrown by IViewRule calls. That way the full stack trace
is available in the Error Viewer, including line numbers etc.
Change-Id: I0b83df71b36741e65a1eb2003ed044157eb6f0cd
The Android Open Source Project [Tue, 14 Dec 2010 20:16:19 +0000 (12:16 -0800)]
merge from open-source master
Change-Id: I0fe4564afaad2e9785b68de6f623f69534c5282c
Xavier Ducrohet [Tue, 14 Dec 2010 20:03:31 +0000 (12:03 -0800)]
Merge "ninepatch support for drawing at a different density."
The Android Open Source Project [Tue, 14 Dec 2010 15:40:29 +0000 (07:40 -0800)]
merge from open-source master
Change-Id: Ib2eb71e7b07c2ab559d14e5a397f1aa08fa07f74
Jean-Baptiste Queru [Tue, 14 Dec 2010 15:31:39 +0000 (07:31 -0800)]
Merge "reconcile tools_r8 into master"
The Android Open Source Project [Tue, 14 Dec 2010 15:26:32 +0000 (07:26 -0800)]
merge from open-source master
Change-Id: I671ef75eb1301f4c2d6c667f943d538e64dd81d8
Jean-Baptiste Queru [Tue, 14 Dec 2010 15:24:48 +0000 (07:24 -0800)]
reconcile tools_r8 into master
Change-Id: I517ffaa035e3d403f06c942806e9fd4e3d1a01f1
Tor Norbye [Tue, 14 Dec 2010 15:20:08 +0000 (07:20 -0800)]
Merge "Add Java Hyperlink Support and XML improvements"
Xavier Ducrohet [Tue, 14 Dec 2010 02:27:10 +0000 (18:27 -0800)]
ninepatch support for drawing at a different density.
Change-Id: I0932f8a51d30c256157fccf67e77cf165ba93b58
The Android Open Source Project [Tue, 14 Dec 2010 02:36:38 +0000 (18:36 -0800)]
merge from open-source master
Change-Id: I9036a5154f006f1f6ba6685b9b8985db07a66ed0
Xavier Ducrohet [Tue, 14 Dec 2010 02:24:40 +0000 (18:24 -0800)]
Merge "Move to rev 10 and update change log"
Xavier Ducrohet [Tue, 14 Dec 2010 02:24:32 +0000 (18:24 -0800)]
Merge "ADT: always give fill_parent to layoutlib."
Xavier Ducrohet [Mon, 13 Dec 2010 22:18:09 +0000 (14:18 -0800)]
ADT: always give fill_parent to layoutlib.
If a layout is created for Android 2.3 but then rendered in 1.5 it'll
fail because 1.5 doesn't know what match_parent is.
This change makes the parser given to layoutlib replace on the fly
match_parent with fill_parent.
Change-Id: I45a22dea98388f8f0c5673bdaa9cbbf9a88f5422
Tor Norbye [Thu, 9 Dec 2010 23:35:49 +0000 (15:35 -0800)]
Add Java Hyperlink Support and XML improvements
Adds Android-related hyperlinks to Java files. If you for example
have this code in your Activity:
setContentView(R.layout.main);
and you control click on "main", this will now offer (in addition to
the normal "Declaration" hyperlink) go to "XML Declaration"), which
will then warp to the main.xml file.
You can add in the second modifier key to directly jump to the Android
resource and bypass the normal Java declaration (which would take you
into the R file). The Android Java hyperlink works from R file field
declarations too by the way.
This now also works for id attributes defined inline, so if you for
example jump to R.id.Button01, and this will open the first
@+id/Button01 element found in the layout directory.
You can also open non-XML references, such as @drawable/icon. This
will run the Eclipse open command on the icon.
The processing of XML regions is improved, so it will now only
highlight say the value part of an XML attribute, or the name part or
the element tag name part.
Finally, the hyperlink resolvers can now jump into @android resource
files (as found in the SDK data directory). Thus, you can warp into
(say) @android:drawable/alert_dark_frame.
Change-Id: I83fcd1ffb08590f7f587b90f5c64784fe8ce5f67
Xavier Ducrohet [Fri, 10 Dec 2010 22:02:31 +0000 (14:02 -0800)]
Move to rev 10 and update change log
Change-Id: I477033c03a40c52d26b73efa892a65feafaba680
The Android Open Source Project [Mon, 13 Dec 2010 21:46:31 +0000 (13:46 -0800)]
merge from open-source master
Change-Id: Ia42f091826d46887e8388b2d1df5f97145c0fdba
Xavier Ducrohet [Mon, 13 Dec 2010 21:44:48 +0000 (13:44 -0800)]
Merge "ADT: Fix issue with launch checking manifest debuggable attribute."
Xavier Ducrohet [Mon, 13 Dec 2010 20:30:20 +0000 (12:30 -0800)]
ADT: Fix issue with launch checking manifest debuggable attribute.
The builds done by the incremental builders now always insert
debuggable=true (unless there's another value already set), so
the check for the attribute at lauch should only test if the
attribute is set to false manually.
Change-Id: Ia0949af16e1650352eb7d52bde3a93bb180b8be2
The Android Open Source Project [Sat, 11 Dec 2010 00:30:08 +0000 (16:30 -0800)]
merge from open-source master
Change-Id: If30b689b9531f0160e5b8749d6b417009df676be
Tor Norbye [Sat, 11 Dec 2010 00:19:35 +0000 (16:19 -0800)]
Merge "Add support for including within specific configurations"
Tor Norbye [Thu, 9 Dec 2010 19:35:23 +0000 (11:35 -0800)]
Add support for including within specific configurations
The current support for includes are limited to including a view
within the "base" layouts (defined in layouts/). This changeset
generalizes this to track ALL include-sources (such as an include from
the landscape version) and offers to let you view and edit the current
view within each of those specific configurations. The configuration
will be switched to one that is compatible with the outer, including
view. It is possible that this will switch to a different inner view;
that seems better than trying to force editing an inner view in an
outer view that won't actually be shown at runtime.
We should enhance the configuration chooser such that it will only
offer options in its various combo boxes that are compatible with the
inner view as well. That is not addressed by this changeset.
Change-Id: Id5171d367cf65e2403bbac1640a179de4b420bd6
The Android Open Source Project [Fri, 10 Dec 2010 19:42:48 +0000 (11:42 -0800)]
merge from open-source master
Change-Id: Ida959439a80e7d2ee1c3ae0d5a27a1b9d32cda66
Xavier Ducrohet [Fri, 10 Dec 2010 19:31:23 +0000 (11:31 -0800)]
Merge "Clean up the api around Layoutlib."
Xavier Ducrohet [Fri, 10 Dec 2010 03:40:29 +0000 (19:40 -0800)]
Clean up the api around Layoutlib.
Move (Style/DensityBased)ResourceValue into layoutlib_api
and make the API use that instead of the interface.
We'll get ride of the interfaces once only obsolete platforms
use them.
In ide-commons also got rid of LayoutBridgeWrapper and moved
the code in LayoutLibrary which does not expose the bridge
anymore, and instead expose an API similar to the LayoutBridge
class.
Updated ADT to use LayoutLibrary directly instead of going through
LayoutLibrary.getBridge(). This allows us to hide some
things like querying the API level and relying instead on
Capabilities (with special handle for legacy bridges).
Also added an error message to LayoutLibrary to display why
it may have failed to load.
Added a check to the API level and don't load layoutlib
that are more recent than the client.
Change-Id: Ie4e615d8d32485ee577bb88e95cd3f562bf590cb
The Android Open Source Project [Fri, 10 Dec 2010 03:05:13 +0000 (19:05 -0800)]
merge from open-source master
Change-Id: I0a12e8ebfadec0aa9bfb51f5704713df7b9bcd99
Tor Norbye [Fri, 10 Dec 2010 03:03:19 +0000 (19:03 -0800)]
Merge "Fix threading issue with layout reload"
Tor Norbye [Fri, 10 Dec 2010 02:48:40 +0000 (18:48 -0800)]
Fix threading issue with layout reload
The layout change listener (which can be called on any thread) must
not access SWT state unless it's on the SWT thread. There were some
existing SWT-redispatch blocks to handle this, but one code path was
missing. This changeset moves the entire method under a single SWT
redispatch block instead.
Change-Id: I7d802d78fbdd4811c68de830e1a54b1a97d76b5f
The Android Open Source Project [Fri, 10 Dec 2010 00:13:41 +0000 (16:13 -0800)]
merge from open-source master
Change-Id: I022ae6ce3c8fc73255695c9338b36c25ba1b8f9a
Xavier Ducrohet [Fri, 10 Dec 2010 00:04:51 +0000 (16:04 -0800)]
Merge "Remove broken assert."
The Android Open Source Project [Thu, 9 Dec 2010 23:38:47 +0000 (15:38 -0800)]
merge from open-source master
Change-Id: I49af2546030d8ca030331a8511a6cc6649bc843b
Tor Norbye [Thu, 9 Dec 2010 23:35:21 +0000 (15:35 -0800)]
Merge "Issue 13051: Use match_parent or fill_parent based on API level"
The Android Open Source Project [Thu, 9 Dec 2010 23:27:12 +0000 (15:27 -0800)]
merge from open-source master
Change-Id: I44769cb782bd257d71ad308d7d2ce9d2039a9d81
Tor Norbye [Thu, 9 Dec 2010 23:22:29 +0000 (15:22 -0800)]
Merge "Add a hyperlink resolved for Android XML files"
Tor Norbye [Thu, 9 Dec 2010 22:49:13 +0000 (14:49 -0800)]
Issue 13051: Use match_parent or fill_parent based on API level
Fixes issue 13051: New layout editor always insert "match_parent",
even on older platform.
View rules can now look up the API level of the current project, and
based on that choose to use match_parent or fill_parent when they need
to manipulate the layout attributes.
Change-Id: I861e1f7f7409c40c05b1472268f120806667025c
Tor Norbye [Sat, 4 Dec 2010 21:52:52 +0000 (13:52 -0800)]
Add a hyperlink resolved for Android XML files
This changeset adds basic hyperlink handling to Android XML files
(such as AndroidManifest.xml and layout xml files).
It registers a hyperlink detector for our XML files, and the hyperlink
detector looks up the XML model and finds the node and attributes
under the cursor. If found. it then checks these attributes for a set
of patterns that it can link to:
* If it finds an <activity> element, it looks up the activity name and
the package on the root element, and lets you jump to the activity.
Ditto for services.
* If it finds a @layout attribute value, it attempts to open the
corresponding layout file in the res/ folder in the project. Ditto
for other per-file resources like @drawable, etc.
* If it finds a value resource, like @string, @dimen, etc, it will
search through the various XML files in values/ and open up the
corresponding XML declaration in the editor with the declaration
selected.
Note that the resolver does NOT use proper full resource resolution
based on the SDK parsing that we have in use within the layout editor
etc. That's the natural next step.
Change-Id: I5880878fe67f26fb8d3b08b808c02baa1049f2c5
Xavier Ducrohet [Thu, 9 Dec 2010 20:10:42 +0000 (12:10 -0800)]
Remove broken assert.
The assert can be false in normal condition.
Change-Id: I7181556e3ba32f765eca8e14997622557402a2da
The Android Open Source Project [Thu, 9 Dec 2010 19:34:13 +0000 (11:34 -0800)]
merge from open-source master
Change-Id: I377761c7b5568f9e66331540b8db82f08a09c1eb
Jean-Baptiste Queru [Thu, 9 Dec 2010 19:30:19 +0000 (11:30 -0800)]
Merge "Fix the build by putting a missing LOCAL_MODULE_TAGS"
Raphaël Moll [Thu, 9 Dec 2010 19:23:17 +0000 (11:23 -0800)]
Merge "android.el: Make android-uninstall-app not reinstall"
Xavier Ducrohet [Thu, 11 Nov 2010 23:14:52 +0000 (15:14 -0800)]
Fix the build by putting a missing LOCAL_MODULE_TAGS
Change-Id: Ie5cdd59663ef469204f693c888231a2476d954f4
Richard Lowe [Thu, 9 Dec 2010 16:13:00 +0000 (11:13 -0500)]
android.el: Make android-uninstall-app not reinstall
- uninstall, rather than reinstalling the app
- Fix reference to argument
Change-Id: I66afe170c1d0ce2e5acfccf7a0c635fd07764f32
The Android Open Source Project [Thu, 9 Dec 2010 02:20:45 +0000 (18:20 -0800)]
merge from open-source master
Change-Id: If84e27b805642bf5a1b0ca11f4c9c5dc40b0c6af
Xavier Ducrohet [Thu, 9 Dec 2010 02:06:17 +0000 (18:06 -0800)]
Merge "Add Ant version check in setup task."
The Android Open Source Project [Thu, 9 Dec 2010 01:45:09 +0000 (17:45 -0800)]
merge from open-source master
Change-Id: I8578293242ea685fce5edf3e97390e3c49134821
Xavier Ducrohet [Thu, 9 Dec 2010 01:34:20 +0000 (17:34 -0800)]
Merge "Add swingworker back to the sdk."
Xavier Ducrohet [Thu, 9 Dec 2010 01:32:19 +0000 (17:32 -0800)]
Add Ant version check in setup task.
Change-Id: Id2237ae2fd64a1ccae5b1a1957099c218cdaf9a5
Xavier Ducrohet [Thu, 9 Dec 2010 00:44:57 +0000 (16:44 -0800)]
Add swingworker back to the sdk.
Needed by draw9patch
Change-Id: I677e4ba5230aa5a8bfc1d497ec2381131c3940d7
The Android Open Source Project [Wed, 8 Dec 2010 23:28:39 +0000 (15:28 -0800)]
merge from open-source master
Change-Id: Ic18b178a2e5f072b09b2f3baff01dfcd5ae74928
Tor Norbye [Wed, 8 Dec 2010 23:24:46 +0000 (15:24 -0800)]
Merge "Include View Support"
The Android Open Source Project [Wed, 8 Dec 2010 23:17:08 +0000 (15:17 -0800)]
merge from open-source master
Change-Id: I90dfe6e962798b0004ef7a2837e737de32227a86
Xavier Ducrohet [Wed, 8 Dec 2010 23:05:08 +0000 (15:05 -0800)]
Merge "Improve test apps to make them easier to use."
Xavier Ducrohet [Wed, 8 Dec 2010 23:05:01 +0000 (15:05 -0800)]
Merge "ADT: Update changelog for ADT 8.0.1"
Xavier Ducrohet [Wed, 8 Dec 2010 23:04:54 +0000 (15:04 -0800)]
Merge "Fix test apps using a library"
Xavier Ducrohet [Wed, 8 Dec 2010 00:31:31 +0000 (16:31 -0800)]
Improve test apps to make them easier to use.
Each app now properly reference its name in layout output and
in launcher activities.
Change-Id: If404b61afc4eb193b01c2b4f8ef44194f5726d93
The Android Open Source Project [Tue, 7 Dec 2010 23:39:14 +0000 (15:39 -0800)]
merge from open-source master
Change-Id: I385c7b4d3e0889078a8112b732e2d51b7ec45720
Xavier Ducrohet [Tue, 7 Dec 2010 23:29:43 +0000 (15:29 -0800)]
Merge "Cherry-pick
0ec90f2b from tools_r8"
Xavier Ducrohet [Tue, 7 Dec 2010 23:29:25 +0000 (15:29 -0800)]
Merge "Cherry-pick
231ec810 from tools_r8"
Raphael Moll [Tue, 7 Dec 2010 04:32:05 +0000 (20:32 -0800)]
Cherry-pick
0ec90f2b from tools_r8
Display output error in the exception's toString..
Change-Id: Idce557d2c172d27abaf474d14136f48d7c3396dc
Xavier Ducrohet [Tue, 7 Dec 2010 04:23:28 +0000 (20:23 -0800)]
Cherry-pick
231ec810 from tools_r8
Improved error message during export.
Change-Id: Ic4b0bf8cfbf59b70a797a31036eb9204481e29d9
Xavier Ducrohet [Tue, 7 Dec 2010 23:18:29 +0000 (15:18 -0800)]
Fix test apps using a library
Change-Id: I173e7728db86f01d15067555b936e90c4687347d
Xavier Ducrohet [Tue, 7 Dec 2010 20:16:53 +0000 (12:16 -0800)]
ADT: Update changelog for ADT 8.0.1
Change-Id: I7133aa293b2d1e0ef3ba65f8ec91fb95cda4ee66
Tor Norbye [Mon, 29 Nov 2010 03:23:42 +0000 (19:23 -0800)]
Include View Support
Add improved support for includes. You can now view and edit a layout
within another containing layout. On a page with includes, you can
double click to warp into the included layout, and it will be shown
within the container layout (but with a semi-translucent mask to make
it obvious that you are editing only the included content, not the
container.)
You can also right click on a view and choose "Show Included In",
which is a pull-right which lists all the other layouts that are
including this view. (If there are no such views, the menu item will
be empty).
In addition, this changeset adds code to detect if there are cycles in
the includes, and if so adds a problem marker in the Problems view
listing the offending chain of includes.
This is all managed by a new "IncludeFinder" class, which listens for
resource file edits (so it only kicks in when you save an XML file,
not after each XML edit). It scans layout XML files for includes and
maintains a map of file includes. This is done such that it can very
quickly provide a list of all files that are including a given target
file. This list is also persisted across IDE sessions via a project
property.
Also fixes outline-expansion to ensure that the outline always shows
the top level children.
Note: The include-relationships are based on the base layouts (the
ones in layouts/, not in customized versions in layout-land,
layout-port, etc.)
Change-Id: I710560f03f7e214219669af8ffba91874d9881b9
The Android Open Source Project [Tue, 7 Dec 2010 05:06:39 +0000 (21:06 -0800)]
merge from open-source master
Change-Id: Ic2a785d3ab59e297e34d8d5814081ea467c36f79
Xavier Ducrohet [Tue, 7 Dec 2010 05:02:36 +0000 (21:02 -0800)]
Merge "New test project for Eclipse: referencing java projects."
Xavier Ducrohet [Tue, 7 Dec 2010 05:02:25 +0000 (21:02 -0800)]
Merge "Update test apps and bundle them in the meta sdk."
Xavier Ducrohet [Tue, 7 Dec 2010 04:35:03 +0000 (20:35 -0800)]
Merge "Display output error in the exception's toString.." into tools_r8
Xavier Ducrohet [Tue, 7 Dec 2010 04:34:26 +0000 (20:34 -0800)]
Merge "Improved error message during export." into tools_r8
Raphael Moll [Tue, 7 Dec 2010 04:32:05 +0000 (20:32 -0800)]
Display output error in the exception's toString..
Change-Id: I050a663fc760f0b0c98a7d8dbcfa141168e30030
Xavier Ducrohet [Tue, 7 Dec 2010 04:23:28 +0000 (20:23 -0800)]
Improved error message during export.
Change-Id: Idb9981348df22e73de3f3d2a72de50a392115cc4
The Android Open Source Project [Tue, 7 Dec 2010 01:12:45 +0000 (17:12 -0800)]
merge from open-source master
Change-Id: I55e331269669022975c7dfceace907b31bc32774
Xavier Ducrohet [Tue, 7 Dec 2010 01:09:30 +0000 (17:09 -0800)]
Merge "Move ADT to 8.0.1. DO NOT MERGE." into tools_r8
Xavier Ducrohet [Tue, 7 Dec 2010 00:56:44 +0000 (16:56 -0800)]
New test project for Eclipse: referencing java projects.
Change-Id: I4ac4f89ad4c40c0073d7c24662f5a8e8740b696a
Xavier Ducrohet [Tue, 7 Dec 2010 01:03:26 +0000 (17:03 -0800)]
Move ADT to 8.0.1. DO NOT MERGE.
Change-Id: I6799193d90ede08e37d18c6e4974bd3abcef7d32
The Android Open Source Project [Tue, 7 Dec 2010 01:01:19 +0000 (17:01 -0800)]
merge from tools_r8
Change-Id: Id9fb9a21e526a1f3becef3a44573d54868465348
The Android Open Source Project [Tue, 7 Dec 2010 01:01:14 +0000 (17:01 -0800)]
merge from open-source master
Change-Id: I9b935e3015d8d723b5635cd27e760673c4e218dd
Xavier Ducrohet [Tue, 7 Dec 2010 01:00:14 +0000 (17:00 -0800)]
Merge "cherry pick: Fix issue with referenced Java Project." into tools_r8
Xavier Ducrohet [Tue, 7 Dec 2010 00:23:25 +0000 (16:23 -0800)]
cherry pick: Fix issue with referenced Java Project.
Also improve slightly DX error reporting.
This is cherry-picked from master.
Change-Id: Iaaca9625575d87a607b21bf81636315820d76c2c
Xavier Ducrohet [Tue, 7 Dec 2010 00:49:19 +0000 (16:49 -0800)]
Merge "Fix issue with referenced Java Project."
Xavier Ducrohet [Tue, 7 Dec 2010 00:23:25 +0000 (16:23 -0800)]
Fix issue with referenced Java Project.
Also improve slightly DX error reporting.
Change-Id: I2f84f74efb9695db732ac188bd37e62bfdb533c5
The Android Open Source Project [Tue, 7 Dec 2010 00:11:39 +0000 (16:11 -0800)]
merge from open-source master
Change-Id: I340b8fffb994f785620bae62f4d63afb9b9529e2
Raphael Moll [Tue, 7 Dec 2010 00:06:58 +0000 (16:06 -0800)]
Merge "ADT: Make ExtractString work on unsaved buffers."
Raphael Moll [Tue, 7 Dec 2010 00:04:27 +0000 (16:04 -0800)]
Merge "Cleanup refactoring."
Xavier Ducrohet [Mon, 6 Dec 2010 23:52:43 +0000 (15:52 -0800)]
Update test apps and bundle them in the meta sdk.
- make it so that layout display something about the project,
and possibly the result of calling out to class coming from jar files.
- make the activity names on the launcher to be the name of the projects.
Change-Id: I318255c3284337be28220df509630cfff4eae38b
The Android Open Source Project [Mon, 6 Dec 2010 23:48:43 +0000 (15:48 -0800)]
merge from open-source master
Change-Id: I8c476cb8b3805281c71818da08e27d63257afe05
Tor Norbye [Mon, 6 Dec 2010 23:42:11 +0000 (15:42 -0800)]
Merge "Change context menu label from "Clear" to "Default""