OSDN Git Service
Tor Norbye [Tue, 18 Jan 2011 03:33:58 +0000 (19:33 -0800)]
Merge "Add ZoomButton default image" into tools_r9
Tor Norbye [Tue, 18 Jan 2011 03:33:45 +0000 (19:33 -0800)]
Merge "Drop handler for RadioGroup, WebView" into tools_r9
Tor Norbye [Mon, 17 Jan 2011 23:11:45 +0000 (15:11 -0800)]
Add ZoomButton default image
ZoomButton extends ImageButton so it was picking up the
default image, but for ZoomButtons use one of the builtin
zoom images instead.
Change-Id: Iadb4f16cc5e3bc137c25ed7fc3872a0b19bd38d6
Tor Norbye [Mon, 17 Jan 2011 23:05:36 +0000 (15:05 -0800)]
Drop handler for RadioGroup, WebView
Add a drop handler for radiogroup which puts a few radio buttons in
it.
Make WebView default to match parent in both dimensions.
Also fix superclass of the SlidingDrawerRule.
Change-Id: I05467bd06f074692603c236b9f3fd947fe7e63fc
Tor Norbye [Mon, 17 Jan 2011 22:11:50 +0000 (14:11 -0800)]
Merge "Add drop handler for SlidingDrawer" into tools_r9
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
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
Tor Norbye [Mon, 17 Jan 2011 20:11:51 +0000 (12:11 -0800)]
Merge "Combine missing class errors with logger errors" into tools_r9
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
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: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
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: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
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
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
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
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
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
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
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
Tor Norbye [Fri, 14 Jan 2011 15:26:38 +0000 (07:26 -0800)]
Merge "Use LayoutLog.TAG_RESOURCES_PREFIX" into tools_r9
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
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
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
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
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
Xavier Ducrohet [Thu, 13 Jan 2011 18:11:53 +0000 (10:11 -0800)]
Merge "Misc fix in ProjectCallback." into tools_r9
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
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
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
Xavier Ducrohet [Thu, 13 Jan 2011 01:29:59 +0000 (17:29 -0800)]
Merge "New layoutlib API: getViewParent and getViewIndex" into tools_r9
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
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
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:35:19 +0000 (10:35 -0800)]
Resource parser should strip unescaped " from string values.
Change-Id: I15cc5becdf139a7eeb01309d0d903a35ba773ed9
Xavier Ducrohet [Wed, 12 Jan 2011 03:14:38 +0000 (19:14 -0800)]
Merge "Choose a good locale when opening a file for the first time." into tools_r9
Xavier Ducrohet [Wed, 12 Jan 2011 02:57:05 +0000 (18:57 -0800)]
Choose a good locale when opening a file for the first time.
Because the selection of the full config to use for display
is complicated (due to having to find something that matches
the configuration of the edited file), this is a bit more
complex than simply changing the select in updateLocales().
In fact the selection made there when there is no stored config
is pointless. Instead it's decided later by findAndSetCompatibleConfig
which find the proper combination of device and locale*
* this is actually broken since we added the nightmode and dock mode.
We need to include those in the list of config we try out. I'll fix
this in a later patch.
Change-Id: I83599dc7f0d1a921f9568b6de5c065ca1e82e103
Tor Norbye [Wed, 12 Jan 2011 02:19:09 +0000 (18:19 -0800)]
Merge "Reorder animation submenu" into tools_r9
Tor Norbye [Wed, 12 Jan 2011 02:05:57 +0000 (18:05 -0800)]
Reorder animation submenu
List local animations first, followed by the Create button, followed
by the frameworks animation submenu. Also drop the recent-item.
Change-Id: I238ab85f319383c138ce8e63fd19c7f97a23ea5e
Xavier Ducrohet [Wed, 12 Jan 2011 01:23:30 +0000 (17:23 -0800)]
Merge "Don't reopen a layout if it's already opened." into tools_r9
Tor Norbye [Wed, 12 Jan 2011 01:21:10 +0000 (17:21 -0800)]
Merge "Use res/animator rather than res/anim for the Play Animation code" into tools_r9
Xavier Ducrohet [Wed, 12 Jan 2011 01:16:56 +0000 (17:16 -0800)]
Don't reopen a layout if it's already opened.
This is for the case where a layout is opened
and Eclipse tell its editor to re-open it because it was
double clicked again in the package explorer due to the
MatchingStrategy having returned true.
Change-Id: I404494b990215bcdff163a382ecb411e2efb9b51
Misc: reorder configs for the WXGA device config.
Tor Norbye [Tue, 11 Jan 2011 22:50:59 +0000 (14:50 -0800)]
Use res/animator rather than res/anim for the Play Animation code
We should be using ResourceType.ANIMATOR rather than ResourceType.ANIM
for the designtime playable animations. Simple tweak to make the
"Create Animation" dialog able to create files into res/animator/,
though this needs to be improved (with proper animator/interpolator
root elements etc).
Change-Id: I70a504fbd946da3ff161f9cf953b878a41886fee
Xavier Ducrohet [Tue, 11 Jan 2011 22:39:28 +0000 (14:39 -0800)]
Merge "This is tools r9 in tools_r9. DO NOT MERGE." into tools_r9
Xavier Ducrohet [Tue, 11 Jan 2011 22:37:48 +0000 (14:37 -0800)]
This is tools r9 in tools_r9. DO NOT MERGE.
Change-Id: I4d6d8cd74abd2cb3b9087ac4f30b761d803e15e3
Tor Norbye [Tue, 11 Jan 2011 22:37:04 +0000 (14:37 -0800)]
Merge "Wrap error text" into tools_r9
Tor Norbye [Tue, 11 Jan 2011 21:36:23 +0000 (13:36 -0800)]
Wrap error text
Wide lines in the error label for rendering errors were not
wrapped. Annoying when you're trying to copy & paste a path out of it
to examine the file in question, etc.
Change-Id: I29b5a8cb25e26dbf8e5a5314bb82c400352e6760
Tor Norbye [Tue, 11 Jan 2011 21:32:49 +0000 (13:32 -0800)]
Merge "Reformat changes.txt" into tools_r9
Xavier Ducrohet [Tue, 11 Jan 2011 21:31:57 +0000 (13:31 -0800)]
Merge "Remove error(tag, throwable) from LayoutLog." into tools_r9
Tor Norbye [Tue, 11 Jan 2011 03:45:35 +0000 (19:45 -0800)]
Reformat changes.txt
Make the changes.txt wrap such that it's easier to read long lines.
Change-Id: I037751470aab172fc486530bad645beb2ed487a2
Tor Norbye [Tue, 11 Jan 2011 21:28:57 +0000 (13:28 -0800)]
Merge "Additions to changes.txt" into tools_r9
Tor Norbye [Tue, 11 Jan 2011 03:20:45 +0000 (19:20 -0800)]
Additions to changes.txt
Change-Id: Ib94abd4c1006a88e3e3db6b9e7e0e528ffb52316
Xavier Ducrohet [Tue, 11 Jan 2011 21:12:23 +0000 (13:12 -0800)]
Remove error(tag, throwable) from LayoutLog.
We should never only log an exception with no associated
message.
Also, I've found several case in the layoutlib where there
is a message in place of the tag.
This new API makes it more clear that there's both a tag and a message
since both are required for error()
Change-Id: I6d5f45c07b1cb8df96311d930170526bb729fae6
Tor Norbye [Tue, 11 Jan 2011 21:03:34 +0000 (13:03 -0800)]
Merge "Changes to widget text and id format" into tools_r9
Tor Norbye [Tue, 11 Jan 2011 01:27:49 +0000 (17:27 -0800)]
Changes to widget text and id format
This changeset changes the default text and id attributes of newly
dropped widgets in the following ways:
1. Use the node class name rather than the id as the initial text. In
other words, the default label for a button is "Button" rather than
"@+id/Button01". This is a more common convention in other GUI
builders, and you typically don't want the actual label to be
"@+id"-something, you want it to be "@string"-something, so the @id
prefix is slightly confusing for beginners.
2. The id uses method name capitalization rather than class name
capitalization, e.g. "checkBox" rather than "CheckBox". This seems
to be the convention I see in handwritten layouts, which makes
sense given that the reference will be compiled to and referenced
as a Java field.
3. In the case of conflicts, don't use a leading 0; in other words,
rather than button01, button02, button03 we have button1, button2,
button3. It's unlikely that the user will have ten or more unnamed
widgets (and if they do the leading zero still isn't needed.) The
code which looks for name conflicts now also performs case
insensitive comparisons.
Change-Id: Ie7f2c5dd8e9852acec2c2e154ee20142b8ece9a6
Tor Norbye [Tue, 11 Jan 2011 20:47:48 +0000 (12:47 -0800)]
Merge "Make the error text participate in select all and copy" into tools_r9
Tor Norbye [Mon, 10 Jan 2011 14:56:18 +0000 (06:56 -0800)]
Make the error text participate in select all and copy
When there are rendering errors, the error messages are listed in a
StyledText widget which opens up at the bottom of the layout editor.
This changeset makes it possible to copy & paste the error message. It
does this by:
- Making the global Select All action operate on the error label when
the error label has focus
- Make the global Copy action operate on the error label if the error
label has selected text (which could have been made selected either
by the Select All action above, or by a manual mouse selection)
Change-Id: Ia7f267737a0d43a54dce8cf6b5f5802aef038881
Xavier Ducrohet [Tue, 11 Jan 2011 18:09:47 +0000 (10:09 -0800)]
Merge "Merge into
f9297748 r9: Handle Animator and Interpolator resources." into tools_r9
Xavier Ducrohet [Tue, 11 Jan 2011 05:45:45 +0000 (21:45 -0800)]
Merge into
f9297748 r9: Handle Animator and Interpolator resources.
Change-Id: I85242fb436e7de99887bd60b320a16a051bddc51
Jean-Baptiste Queru [Mon, 10 Jan 2011 22:54:11 +0000 (14:54 -0800)]
reconcile standalone tools_r9 into master
Change-Id: I822ae7661ec1a4f2995176bf592c7bbbf83e57bb
Raphael Moll [Mon, 10 Jan 2011 22:39:32 +0000 (14:39 -0800)]
Merge "Update changes.txt."
Tor Norbye [Mon, 10 Jan 2011 22:22:20 +0000 (14:22 -0800)]
Merge "Add "Play Animation" menu"
Tor Norbye [Mon, 10 Jan 2011 22:21:21 +0000 (14:21 -0800)]
Merge "Disallow Java keywords in resource names"
Tor Norbye [Mon, 10 Jan 2011 22:21:05 +0000 (14:21 -0800)]
Merge "Use Reference Chooser rather than String dialog for "Edit Text""
Tor Norbye [Mon, 10 Jan 2011 22:20:47 +0000 (14:20 -0800)]
Merge "Allow blank strings for the text property input"
Raphael Moll [Sat, 8 Jan 2011 06:48:26 +0000 (22:48 -0800)]
Update changes.txt.
Change-Id: Id616f7afd275a218324959ff9d52d1b4529f7cd1
Tor Norbye [Mon, 10 Jan 2011 19:49:21 +0000 (11:49 -0800)]
Disallow Java keywords in resource names
If you create a resource file that is a Java keyword, Bad Stuff
happens - it doesn't even make it into the R file.
This modifiers the resource name validator (used among other places in
the New XML File wizard) to disallow these names along with a suitable
error message.
Change-Id: Ic807bb9194d316f227bf3435509632374113563d
Tor Norbye [Mon, 10 Jan 2011 19:08:52 +0000 (11:08 -0800)]
Add "Play Animation" menu
Adds a new dynamically populated context menu named "Play Animation", which
contains 4 sections:
- First, the most recently played animation name. This is initially
empty, but once you've played an animation, the most recently one is
listed there.
- "Create...". This is a shortcut which opens the "New Android XML
File" wizard, pre-configured to point at the current project and
with the Animation category selected.
- "Android Builtin >". This is a submenu (also lazily populated) which
lists all the builtin Android framework animations alphabetically.
- The animations in the current project, if any, listed
alphabetically.
Selecting any of the project or framework animation names will cause
the animation to be played once. During the animation, selection and
hover overlays are temporarily hidden.
This is just a start; we should play/rewind/stop buttons, maybe a loop
toggle button, etc somewhere on the screen when you've selected an
aniation. We should also try to filter out animations (especially
framework ones) that have no effect on the current selection.
Finally, error messages need to be handled better since we are reusing
the render session from the editor.
Change-Id: If113b02d458972b5cc2cb253dd9e6c312b8302a9
Xavier Ducrohet [Mon, 10 Jan 2011 19:13:30 +0000 (11:13 -0800)]
Merge "More fine grained layoutlib Capability for animation support."
Raphael Moll [Mon, 10 Jan 2011 18:52:22 +0000 (10:52 -0800)]
Merge "Update changes.txt. Do not merge." into tools_r9