OSDN Git Service
The Android Open Source Project [Mon, 17 Jan 2011 22:23:01 +0000 (14:23 -0800)]
merge from tools_r9
Change-Id: Ie6bd188e272f8415f73fcd6a3e7613581a0d694a
Tor Norbye [Mon, 17 Jan 2011 22:11:50 +0000 (14:11 -0800)]
Merge "Add drop handler for SlidingDrawer" into tools_r9
The Android Open Source Project [Mon, 17 Jan 2011 21:59:55 +0000 (13:59 -0800)]
merge from tools_r9
Change-Id: Ifafb9858ff5ff64ff5050f135de9fa7d46b2972c
Xavier Ducrohet [Mon, 17 Jan 2011 21:57:47 +0000 (13:57 -0800)]
Merge "Move the resource resolution code into ide-common." into tools_r9
Brett Chabot [Mon, 17 Jan 2011 21:56:03 +0000 (13:56 -0800)]
Merge "Make ddmlib recognize a device in adb 'recovery' state."
Tor Norbye [Mon, 17 Jan 2011 21:48:16 +0000 (13:48 -0800)]
Add drop handler for SlidingDrawer
Add a drop handler for SlidingDrawers such that when dropped from the
palette they create the mandatory handle and content
children. (Without this, you get a rendering error instead.)
Change-Id: Icb521fca9cdbb1da14693d4872ef3fb00187d8f7
Xavier Ducrohet [Mon, 17 Jan 2011 20:38:00 +0000 (12:38 -0800)]
Move the resource resolution code into ide-common.
Also move the LayoutLib API to use a new class for all resource
info instead of 2 maps, one string, and a boolean.
The goal is to move resource resolution code into ADT
so that we can use it to better display resource information
in the UI.
Change-Id: Iad1c1719ab0b08d1a7d0987b92d4be1d3a895adf
Brett Chabot [Mon, 17 Jan 2011 21:30:50 +0000 (13:30 -0800)]
Make ddmlib recognize a device in adb 'recovery' state.
Change-Id: I3401b2efb9e0da69539ed84304b06de872ba77aa
The Android Open Source Project [Mon, 17 Jan 2011 20:16:25 +0000 (12:16 -0800)]
merge from tools_r9
Change-Id: I087568f1f1bd1b628ba98aeea97a3300d38df970
Tor Norbye [Mon, 17 Jan 2011 20:11:51 +0000 (12:11 -0800)]
Merge "Combine missing class errors with logger errors" into tools_r9
Brett Chabot [Mon, 17 Jan 2011 19:16:41 +0000 (11:16 -0800)]
Merge "Remove obsolete 'layoutlib.jar' from adt-tests classpath."
Brett Chabot [Mon, 17 Jan 2011 19:14:30 +0000 (11:14 -0800)]
Remove obsolete 'layoutlib.jar' from adt-tests classpath.
Change-Id: I5f32afb7e8786f865841252a96dc236c0ee70e18
Tor Norbye [Sat, 15 Jan 2011 01:32:29 +0000 (17:32 -0800)]
Combine missing class errors with logger errors
When there are missing custom classes, or classes that cannot be
instantiated, a special error display is shown with hyperlinks to the
classes. However, this view does not incorporate the other logging
errors, such as resource failures.
This changeset combines the output so that you see everything --
missing and broken classes, resource warnings, and any other rendering
problems.
It also makes the hyperlinks pointing to classes in the error output
*open* the class if it already exists, and if not, continue to open
the New Class wizard as before.
Change-Id: Ic79282b8f502f03f587028040150e2cca3395fd9
The Android Open Source Project [Mon, 17 Jan 2011 03:49:25 +0000 (19:49 -0800)]
merge from tools_r9
Change-Id: Ic56405a144962972dcf0885554ad5ada65d3a890
Xavier Ducrohet [Mon, 17 Jan 2011 03:42:55 +0000 (19:42 -0800)]
Merge "Reset the ProjectCallback when the rendering target changes." into tools_r9
Xavier Ducrohet [Mon, 17 Jan 2011 03:37:34 +0000 (19:37 -0800)]
Merge "Update test project with java dependency."
Xavier Ducrohet [Mon, 17 Jan 2011 03:37:30 +0000 (19:37 -0800)]
Merge "Look for classes in java projects when loading custom views." into tools_r9
Xavier Ducrohet [Mon, 17 Jan 2011 03:33:41 +0000 (19:33 -0800)]
Reset the ProjectCallback when the rendering target changes.
This is only done if the layout has custom views. This is
because ProjectCallback caches classes, but they are loaded
using the layoutlib classloader for type provided by the
layoutlib.
Since the rendering target changed, the layoutlib changed,
and we need a version of the custom view classes that uses
the base types of the new layoutlib jar.
Change-Id: Ia3e2a8f65d73dab2769d8c7686f970e647432ed3
http://code.google.com/p/android/issues/detail?id=14061
The Android Open Source Project [Mon, 17 Jan 2011 03:14:21 +0000 (19:14 -0800)]
merge from tools_r9
Change-Id: I68c6498ffe1dbcd78bef71b85046501a25cf5231
Xavier Ducrohet [Mon, 17 Jan 2011 03:06:18 +0000 (19:06 -0800)]
Update test project with java dependency.
The android project now has a custom view
that depends on a class in the referenced Java
project.
Change-Id: I59db9dd3b771731e8bd30f9da8072755eee3ce96
The Android Open Source Project [Mon, 17 Jan 2011 03:02:47 +0000 (19:02 -0800)]
merge from tools_r9
Change-Id: I4d3eacaf4725230988c2fbfedad19008401bba05
Tor Norbye [Mon, 17 Jan 2011 03:01:56 +0000 (19:01 -0800)]
Merge "Fix Extract as Include refactoring for layout attributes" into tools_r9
Tor Norbye [Mon, 17 Jan 2011 03:01:05 +0000 (19:01 -0800)]
Merge "Adjust hint feedback location" into tools_r9
Xavier Ducrohet [Mon, 17 Jan 2011 02:20:28 +0000 (18:20 -0800)]
Look for classes in java projects when loading custom views.
Even if Java projects can't really contain custom views,
they can contain classes on which the custom views depend.
The ProjectClassLoader now handles these projects.
Changed the way the LayoutReloadMonitor deals with projects
to handle referenced projects.
Also fixed some API returning arrays to make them return lists.
http://code.google.com/p/android/issues/detail?id=13010
Change-Id: I7f9da9d5289a5f2735c2cf3638bedc1efbd0c71a
Xavier Ducrohet [Sun, 16 Jan 2011 23:41:02 +0000 (15:41 -0800)]
Merge "Allow the user to set the ADBHOST variable."
The Android Open Source Project [Sun, 16 Jan 2011 23:35:06 +0000 (15:35 -0800)]
merge from tools_r9
Change-Id: If115141a263671ae9073c207b85d22c5d68c2db9
Xavier Ducrohet [Sun, 16 Jan 2011 23:33:50 +0000 (15:33 -0800)]
Merge "Udpate changelog after tools_r9 was updated to a newer version of " into tools_r9
Xavier Ducrohet [Sun, 16 Jan 2011 23:32:41 +0000 (15:32 -0800)]
Udpate changelog after tools_r9 was updated to a newer version of
Change-Id: I5fc5231b762c719de26c2cd01ea3b2a26cee521b
The Android Open Source Project [Sun, 16 Jan 2011 22:26:05 +0000 (14:26 -0800)]
merge from tools_r9
Change-Id: I51577e76c8c679f0c5f631411c71ea062acf22f6
Xavier Ducrohet [Sun, 16 Jan 2011 22:19:00 +0000 (14:19 -0800)]
Merge "Make the default skin a bit more dynamic based on the platform." into tools_r9
Xavier Ducrohet [Sun, 16 Jan 2011 22:18:32 +0000 (14:18 -0800)]
Merge "Move ValueResourceParser into a better package." into tools_r9
The Android Open Source Project [Sun, 16 Jan 2011 22:14:34 +0000 (14:14 -0800)]
merge from tools_r9
Change-Id: I7fbb367fb5db1b0ffdc7f0dbd41476576a3b4109
Raphaël Moll [Sun, 16 Jan 2011 22:09:49 +0000 (14:09 -0800)]
Merge "Merge "Fix in SdkSources."" into tools_r9
Xavier Ducrohet [Sun, 16 Jan 2011 21:20:09 +0000 (13:20 -0800)]
Make the default skin a bit more dynamic based on the platform.
Change-Id: I37db0034cc106b573f0efb844cae074cb63ba588
Xavier Ducrohet [Sun, 16 Jan 2011 21:11:27 +0000 (13:11 -0800)]
Move ValueResourceParser into a better package.
Change-Id: I15ae7efd2d482bd5bc368983a1745d9026f964b2
Pierre Zurek [Sat, 15 Jan 2011 13:45:21 +0000 (14:45 +0100)]
Merge "Fix in SdkSources."
For User Add-ons, the counter used to save the urls was starting at one
while the counter used to load them was starting at zero.
Now they all start at zero.
Change-Id: Iff5204efe34d69ee8bcc3a4f11c8cc0de4ea7c29
Raphaël Moll [Sat, 15 Jan 2011 18:25:52 +0000 (10:25 -0800)]
Merge "Fix in SdkSources."
Pierre Zurek [Sat, 15 Jan 2011 13:45:21 +0000 (14:45 +0100)]
Fix in SdkSources.
For User Add-ons, the counter used to save the urls was starting at one
while the counter used to load them was starting at zero.
Now they all start at zero.
Change-Id: I8f52800ac8f9b717b45a7d0d509b1f15915b9f03
Tor Norbye [Sat, 15 Jan 2011 06:51:04 +0000 (22:51 -0800)]
Adjust hint feedback location
When you select items in the relative layout, the layout attachments
are displayed below the canvas.
This changeset tweaks the positioning of these hints: they are
displayed to the right of the window (instead of below it) if the
canvas is taller than it is wide.
Change-Id: I7e12ed2f1749d4d3e529bab1a765b6a3279ca084
Tor Norbye [Wed, 12 Jan 2011 16:38:52 +0000 (08:38 -0800)]
Fix Extract as Include refactoring for layout attributes
This changeset fixes several issues with the Extract As Include
operation:
1) Transfer all the layout_ attributes to the include
itself. Generally the layout attributes are particular to the
inclusion context, they are not shared among the different uses of
the include. For example, in layout1, the include may be in a
linear layout and have a layout weight, and in another layout the
included may need relative layout attachments.
2) Generate a new id for the included tag itself
3) For any layout references to the old extracted id, use the include
tag id instead
4) Generate the new layout in the same folder as the source of the
extract operation, since it may depend on properties only defined
there
Change-Id: I515a56fe07cc0ffc1b4fcb6eec8d3a10d383915e
The Android Open Source Project [Sat, 15 Jan 2011 01:20:08 +0000 (17:20 -0800)]
merge from tools_r9
Change-Id: If3a75250300bcc2de62ee0f20e40ff034ab18128
Tor Norbye [Sat, 15 Jan 2011 01:13:26 +0000 (17:13 -0800)]
Merge "Improve hyperlink resolution for configurations" into tools_r9
Tor Norbye [Fri, 14 Jan 2011 01:04:26 +0000 (17:04 -0800)]
Improve hyperlink resolution for configurations
The hyperlink resolver would only look for values in the base values/
folder. This did not work well for resources that are ONLY defined in
specific configurations. This changeset improves the search to look in
all eligible resource folders. It also uses support from the layout
library to more quickly identify the right files to check.
The hyperlink resolver now also considers the configuration chooser in
the designtab (if opened), and uses this configuration
first. Therefore, if you for example have chosen to view a particular
language, hyperlink resolution will jump to the specific translation
string rather than the base string as before.
A few other fixes are included:
- Look in the current file for @id references to resolve first (common
in a layout where you have @id references to attachments)
- Fix search for @attr/ attributes
- Fix bug where attributes inside a custom view class would be ignored
and it would jump to the custom class instead
Change-Id: Ia97a3f45bf454cc28378387b219af0fdd855a902
The Android Open Source Project [Sat, 15 Jan 2011 00:34:00 +0000 (16:34 -0800)]
merge from tools_r9
Change-Id: I31a8c35fb21a68f099059d34e4f01a2e3437f884
Xavier Ducrohet [Sat, 15 Jan 2011 00:25:48 +0000 (16:25 -0800)]
Merge "Fix build by updating adt-test to the new LayoutLog." into tools_r9
Xavier Ducrohet [Sat, 15 Jan 2011 00:25:10 +0000 (16:25 -0800)]
Fix build by updating adt-test to the new LayoutLog.
Change-Id: If6c972fdb379e67686dfaf5af0bcbd6cb4aa4b9c
Xavier Ducrohet [Sat, 15 Jan 2011 00:23:11 +0000 (16:23 -0800)]
Merge "Fix build by updating ide-common to the new LayoutLog." into tools_r9
Xavier Ducrohet [Sat, 15 Jan 2011 00:22:39 +0000 (16:22 -0800)]
Fix build by updating ide-common to the new LayoutLog.
Change-Id: If1a01daa87561f474b4c43d6c404a3c42e98d485
The Android Open Source Project [Fri, 14 Jan 2011 23:59:16 +0000 (15:59 -0800)]
merge from tools_r9
Change-Id: I2351d8cd96b88086e9fac7e0d3e44a71a2193c35
Xavier Ducrohet [Fri, 14 Jan 2011 23:57:45 +0000 (15:57 -0800)]
Merge "Add optional data to LayoutLog API." into tools_r9
Xavier Ducrohet [Fri, 14 Jan 2011 23:47:16 +0000 (15:47 -0800)]
Add optional data to LayoutLog API.
Change-Id: Iaa82c3647996a9ce7d7d348cdc19dce34b941238
The Android Open Source Project [Fri, 14 Jan 2011 19:59:30 +0000 (11:59 -0800)]
merge from tools_r9
Change-Id: Ieca541476bac7f479dec499f3cf23dd13f4f1124
Tor Norbye [Fri, 14 Jan 2011 19:56:45 +0000 (11:56 -0800)]
Merge "Zoom Improvements" into tools_r9
Tor Norbye [Fri, 14 Jan 2011 17:49:12 +0000 (09:49 -0800)]
Zoom Improvements
First, add a new "Zoom to Fit" toolbar action. This will look at the
size of the rendered image, as well as the size of the canvas area,
and compute the largest possible scale factor that will zoom the
rendered image while showing everything.
This is particularly useful when working with larger devices, such as
WXGA, where typically the rendering comes up showing only the top left
portion of the image, and the Zoom Out function often zooms out too
much since it does not have fine granularity.
Second, add icons to the various zooming functions. The zoom in/out
icons are from Eclipse WTP; the other three are minor derivations from
these icons (using = for emulate real size, 1 for 100% and an outline
for zoom to fit).
Third hook up zoom in, zoom out, zoom to 100% and zoom to fit to
keyboard shortcuts (applicable to the canvas only).
Finally, tweak some labels.
(Also updated the ddms screencapture icon, since there was a screen
capture icon in the same Eclipse WTP icon folder)
Change-Id: Idc118a58f418daeefb5835f40dc1fd518b0f99d1
The Android Open Source Project [Fri, 14 Jan 2011 15:33:57 +0000 (07:33 -0800)]
merge from tools_r9
Change-Id: I7e2c116fc72dc34a6e224af0d3701f940a535aef
Tor Norbye [Fri, 14 Jan 2011 15:26:38 +0000 (07:26 -0800)]
Merge "Use LayoutLog.TAG_RESOURCES_PREFIX" into tools_r9
The Android Open Source Project [Fri, 14 Jan 2011 01:09:01 +0000 (17:09 -0800)]
merge from tools_r9
Change-Id: Ic801ee7185efda5e0b7db12d3267726e8d2c8f53
Xavier Ducrohet [Fri, 14 Jan 2011 00:59:05 +0000 (16:59 -0800)]
Merge "ProjectResources.getSourceFiles can now be configured to only return the best match." into tools_r9
Xavier Ducrohet [Fri, 14 Jan 2011 00:47:39 +0000 (16:47 -0800)]
ProjectResources.getSourceFiles can now be configured to only return the best match.
Change-Id: Ia66902604aaf3dc72152c06893da9f6c49c21661
The Android Open Source Project [Fri, 14 Jan 2011 00:45:54 +0000 (16:45 -0800)]
merge from tools_r9
Change-Id: I3abf5d63d69c4609b6b45c689c1dfe66b278f8ef
Xavier Ducrohet [Fri, 14 Jan 2011 00:35:58 +0000 (16:35 -0800)]
Merge "ProjectResources can now be queried for all source file for a given resource." into tools_r9
Xavier Ducrohet [Fri, 14 Jan 2011 00:27:38 +0000 (16:27 -0800)]
ProjectResources can now be queried for all source file for a given resource.
Change-Id: Iaff7ac33d8cdbf246e873188617d59e7c8689aa3
The Android Open Source Project [Fri, 14 Jan 2011 00:22:50 +0000 (16:22 -0800)]
merge from tools_r9
Change-Id: I2c7746cdb6b6df94186aebbc24240c5f457876d0
Tor Norbye [Fri, 14 Jan 2011 00:18:11 +0000 (16:18 -0800)]
Use LayoutLog.TAG_RESOURCES_PREFIX
Change-Id: I17f9030debd05cd4a8c3e17c3656e4b5eeec3b00
Xavier Ducrohet [Fri, 14 Jan 2011 00:12:34 +0000 (16:12 -0800)]
Merge "Add prefix constants for LayoutLog tags." into tools_r9
The Android Open Source Project [Thu, 13 Jan 2011 23:25:17 +0000 (15:25 -0800)]
merge from tools_r9
Change-Id: I28389184c1de4efadd20533825221119d8baa7f1
Tor Norbye [Thu, 13 Jan 2011 23:22:19 +0000 (15:22 -0800)]
Merge "Warn user about compilation errors causing rendering failures" into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 22:52:52 +0000 (14:52 -0800)]
Add prefix constants for LayoutLog tags.
Some tags have "categories", for instance "resources.resolve"
I created a new constant that contains "resources."
Change-Id: Ifda535b3378021a275e73d988bcf5707e9ab39ff
The Android Open Source Project [Thu, 13 Jan 2011 21:53:22 +0000 (13:53 -0800)]
merge from tools_r9
Change-Id: Ie7d415905f23688bc4ae55f0095ff637c7a31e60
Xavier Ducrohet [Thu, 13 Jan 2011 21:45:23 +0000 (13:45 -0800)]
Merge "Add Layoutlib log tag constants to LayoutLog" into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 18:40:09 +0000 (10:40 -0800)]
Add Layoutlib log tag constants to LayoutLog
Change-Id: Idf50886132913728c40c23026c1b55172015904b
Tor Norbye [Wed, 12 Jan 2011 02:52:29 +0000 (18:52 -0800)]
Warn user about compilation errors causing rendering failures
If you have certain types of errors in your project, then rendering
will fail with messages that may be confusing.
This changeset attempts to identify some of these common scenarios and
offer detailed explanations to guide the user in the right direction.
Specifically:
1. If the project contains aapt errors (which means aapt did not run
successfully), AND the rendering failed with an error related to
resource lookup, then begin the render error message with an
explanation in bold that this project contains resource errors that
could explain the below rendering errors, and to investigate those
resource errors first.
2. If the project contains javac errors, AND the rendering failed
after the custom project class loader has been consulted, then
display a message stating that compilation errors could have
caused the failure and to investigate those errors first.
3. If a custom view is loaded, and it does not provide a 2- or 3-
argument constructor (which takes an AttributeSet), emit a warning
that XML attributes on the view will not work.
In addition, this changeset cleans up a few other related things:
- Tags are no longer displayed as part of the error message; these are
intended for internal checking only (for example to identify
resource errors from other errors)
- The error display text can now show a vertical scrollbar if the text
is longer than the available space.
- The code which marks the project class loader as used is marked used
as soon as it's asked to resolve a class name, rather than at the
completion of a successful load, since we want to know about failing
custom classes as well.
Change-Id: Ib37a329eed44719ecf741b96ff96747ec4f92ad0
The Android Open Source Project [Thu, 13 Jan 2011 18:14:15 +0000 (10:14 -0800)]
merge from tools_r9
Change-Id: If6f5d0a68e21a8765d5578584acad730d6168307
Xavier Ducrohet [Thu, 13 Jan 2011 18:11:53 +0000 (10:11 -0800)]
Merge "Misc fix in ProjectCallback." into tools_r9
The Android Open Source Project [Thu, 13 Jan 2011 05:19:03 +0000 (21:19 -0800)]
merge from tools_r9
Change-Id: Iad6814c88502ae6cc5a569b930a0030b9e1904f6
Tor Norbye [Thu, 13 Jan 2011 05:08:27 +0000 (21:08 -0800)]
Merge "Remove <merge> from the palette" into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 04:37:32 +0000 (20:37 -0800)]
Misc fix in ProjectCallback.
Change-Id: I35098d93f54c27c5488e1119fe8dab75492c6899
The Android Open Source Project [Thu, 13 Jan 2011 02:37:45 +0000 (18:37 -0800)]
merge from tools_r9
Change-Id: I139efed2817d3a2d0d80fc2c6e45b9a793c15992
Xavier Ducrohet [Thu, 13 Jan 2011 02:33:31 +0000 (18:33 -0800)]
Merge "Fix MockLog to build on 1.5" into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 02:32:03 +0000 (18:32 -0800)]
Fix MockLog to build on 1.5
Change-Id: Icbdbbae2fe105af6eb1cdb1490a2415007262980
The Android Open Source Project [Thu, 13 Jan 2011 01:51:20 +0000 (17:51 -0800)]
merge from tools_r9
Change-Id: I4de6cfe4ca47f134813fd44f617103f8ac43822c
Xavier Ducrohet [Thu, 13 Jan 2011 01:49:55 +0000 (17:49 -0800)]
Merge "Merge
74f725db from master: Add snapshot handling for AVD creation, details, and launch" into tools_r9
Tim Baverstock [Tue, 30 Nov 2010 11:56:04 +0000 (11:56 +0000)]
Merge
74f725db from master: Add snapshot handling for AVD creation, details, and launch
Also respect 'Wipe User Data' by disabling snapshot launch, and support 'Edit AVD'.
Change-Id: I2fee9361d78d70b80314523e36b48fbd80b03ca7
The Android Open Source Project [Thu, 13 Jan 2011 01:39:49 +0000 (17:39 -0800)]
merge from tools_r9
Change-Id: Ibeeec73aa0f97959c41f8d0ad3ed03afc5bcaee1
Xavier Ducrohet [Thu, 13 Jan 2011 01:29:59 +0000 (17:29 -0800)]
Merge "New layoutlib API: getViewParent and getViewIndex" into tools_r9
The Android Open Source Project [Thu, 13 Jan 2011 01:05:03 +0000 (17:05 -0800)]
merge from tools_r9
Change-Id: I515ff107ebd8bcc34945befc123e637f86f6dec9
Xavier Ducrohet [Thu, 13 Jan 2011 00:54:26 +0000 (16:54 -0800)]
Merge "Properly select dock/night mode combo when opening a layout." into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 00:21:58 +0000 (16:21 -0800)]
New layoutlib API: getViewParent and getViewIndex
Change-Id: I201e42a9a7e31fcef8b7a0c5b91a6abd5d5407bd
The Android Open Source Project [Wed, 12 Jan 2011 23:32:39 +0000 (15:32 -0800)]
merge from tools_r9
Change-Id: I50ef4a713e7c131155a875dc60c6dc2c7ea1b770
Raphael Moll [Wed, 12 Jan 2011 23:30:46 +0000 (15:30 -0800)]
Merge changes Ide9952df,I70fb1a71 into tools_r9
* changes:
Cleanup warnings in the form-based UI editor.
Make it possible to override the SDK path using an env var
Raphael Moll [Wed, 12 Jan 2011 23:22:42 +0000 (15:22 -0800)]
Cleanup warnings in the form-based UI editor.
Change-Id: Ide9952dfefeb86e59d4ed5b1db25150625a54143
Raphael Moll [Wed, 12 Jan 2011 21:54:53 +0000 (13:54 -0800)]
Make it possible to override the SDK path using an env var
The value will only be used if it matches an existing directory.
Useful for testing from Eclipse.
Note: this is a hack that does not change the preferences, so if the user
looks at Window > Preferences > Android, the path will be the preferences
one and not the overriden one.
Change-Id: I70fb1a7117f56d4c6e5cab253c3323480605413f
The Android Open Source Project [Wed, 12 Jan 2011 23:21:06 +0000 (15:21 -0800)]
merge from tools_r9
Change-Id: Ia2299053bb469592e9dc6ae2d816fb2ad05f4c53
Tor Norbye [Wed, 12 Jan 2011 22:38:42 +0000 (14:38 -0800)]
Remove <merge> from the palette
The <include> tag is already removed from the palette. This changeset
does the same thing for the similar <merge> tag, since it does not
work; you cannot drag a <merge> tag somewhere into an existing layout.
(The common case of rendering views with <merge> as the root -does-
work, but that does not involve the palette.)
Change-Id: I9210e196ab66fe77b1303e756384844fde1d1c0f
Xavier Ducrohet [Wed, 12 Jan 2011 21:42:05 +0000 (13:42 -0800)]
Properly select dock/night mode combo when opening a layout.
Change-Id: I3c4f8b875f263970e4c8fc308b466ae14c69c438
Xavier Ducrohet [Wed, 12 Jan 2011 21:42:51 +0000 (13:42 -0800)]
Merge "Resource parser should strip unescaped " from string values." into tools_r9
Xavier Ducrohet [Wed, 12 Jan 2011 18:57:45 +0000 (10:57 -0800)]
Merge "Add snapshot handling for AVD creation, details, and launch"
Xavier Ducrohet [Wed, 12 Jan 2011 18:35:19 +0000 (10:35 -0800)]
Resource parser should strip unescaped " from string values.
Change-Id: I15cc5becdf139a7eeb01309d0d903a35ba773ed9
The Android Open Source Project [Wed, 12 Jan 2011 16:53:45 +0000 (08:53 -0800)]
merge from tools_r9
Change-Id: If87bb7e1e0adfe107c1a26132d63f7d779a06a3b
Tim Baverstock [Tue, 30 Nov 2010 11:56:04 +0000 (11:56 +0000)]
Add snapshot handling for AVD creation, details, and launch
Also respect 'Wipe User Data' by disabling snapshot launch, and support 'Edit AVD'.
Change-Id: I5bc94c316e550b2585ca80185a02ffbe6d3e8401