OSDN Git Service
Xavier Ducrohet [Thu, 27 Jan 2011 03:24:43 +0000 (19:24 -0800)]
Add more theme query APIs to RenderResources
Change-Id: Iebde7536a0007898387dc7bb5d943e3767140a3c
Xavier Ducrohet [Thu, 27 Jan 2011 02:09:34 +0000 (18:09 -0800)]
Properly convert the rendered layout images if alpha is needed.
The layoutlib can specify if the image is rendered as a floating
window, and needs alpha.
If it doesn't needed it we do a faster convert discarding the
alpha which will be better when playing animations in the normal
case.
Change-Id: I2dbd2d1ae9190207b51978e4a8d77cdff25f3e45
Tor Norbye [Wed, 26 Jan 2011 03:24:02 +0000 (19:24 -0800)]
Merge "Palette with previews, categories and view modes"
Tor Norbye [Wed, 26 Jan 2011 03:23:38 +0000 (19:23 -0800)]
Merge "Combine DescDragSourceListener and PreviewDragSourceEffect"
Tor Norbye [Fri, 21 Jan 2011 05:13:39 +0000 (21:13 -0800)]
Palette with previews, categories and view modes
This changeset contains the following improvements to the palette:
1. Display modes. The palette now supports several different view
modes, and you can switch these via the context menu. The modes
are:
a. Previews. This renders previews for all the views using the
current SDK platform, theme, screen density, etc.
b. Small Previews. This is like (a), but scaled down to 75% size.
c. Tiny Previews. Like (a), but scaled down to 50% size.
d. Text + Icon. This shows an icon and the name of the view; this
is the same as what the palette has looked like before this
changeset.
e. Icons only.
All the modes, except for the Text+Icon mode, will lay out the
views in a row (with vertical centering) to fit as much as possible
in the available space for that category.
The view mode, along with other view flags described below, are
preserved across IDE sessions.
2. An accordion view. The palette is now using an Accordion control,
which means it by default will keep a single category open, and it
will always ensure that ALL the category labels are visible in the
current view without scrolling. Via the context menu you can turn
off the auto-close of the previous category. The accordion view
uses vertical scrollbars within each category content area, if
necessary.
The accordion view renders the category headers using open/close
folder icons, a bold font, and a background gradient which varies
between the normal and hovered states.
3. Categories. The category metadata is now used to organize the views
into a handful of different categories. The categories can be
enabled and disabled via the context menu. When you turn off
categories, you get all the views in a single large list.
4. Alphabetical sorting. By default, the views are now sorted
"naturally" (e.g. the metadata provided order, where important
views are listed first). You can switch it to alphabetical order
via the context menu, in which case the items are listed in
alphabetical order, either within their individual categories, or
if categories are turned off, the global view list.
This changeset also adds a new SWT ImageControl. This is necessary to
display the preview images, because the CLabel, which is usually used
to display images in SWT, is hardcoded to hide the icon if there is
not enough horizontal space to display the full label (even when it
has no text label), so for wide preview images the images would simply
disappear when the palette was resized.
Change-Id: I1e1fe051947809206ef9f3a2dfa2fbeae0341107
Tor Norbye [Wed, 26 Jan 2011 01:20:17 +0000 (17:20 -0800)]
Merge "Add error message to log if layoutlib init fails"
Tor Norbye [Wed, 26 Jan 2011 00:03:11 +0000 (16:03 -0800)]
Add error message to log if layoutlib init fails
Change-Id: I5f61733c02002eca9400d5abbfc33393cabd1667
Tor Norbye [Fri, 21 Jan 2011 03:56:08 +0000 (19:56 -0800)]
Combine DescDragSourceListener and PreviewDragSourceEffect
It turns out that a DragSource listener can also set a drag preview
effect, so we don't need to have two separate classes for this; this
was slightly tricky because the drag source needs to get the image
from the preview drag source effect in order to record the right
offsets for the drag.
This changeset rolls the two classes into one, the original drag
source.
Change-Id: I249736c13e49f06886318ea64dc8de40e832d216
Xavier Ducrohet [Tue, 25 Jan 2011 22:13:17 +0000 (14:13 -0800)]
Merge "LayoutLib API update: build properties and multi ViewInfo results."
Xavier Ducrohet [Tue, 25 Jan 2011 21:38:52 +0000 (13:38 -0800)]
LayoutLib API update: build properties and multi ViewInfo results.
The build properties are needed to populate android.os.Build
The multi ViewInfo results are needed to access all the top
level children of a merge layout.
Change-Id: I49638ae76aaf9e83dc4a0a73c3e7966d7b0a14a3
Xavier Ducrohet [Tue, 25 Jan 2011 21:42:08 +0000 (13:42 -0800)]
Merge "ADT: Support class folders during build."
Tor Norbye [Tue, 25 Jan 2011 21:17:50 +0000 (13:17 -0800)]
Merge "Update widget icons"
Tor Norbye [Tue, 25 Jan 2011 20:58:24 +0000 (12:58 -0800)]
Update widget icons
When I generated the icons yesterday I forgot to update the background
layer; it had a flat gray background and in many cases extended a
pixel or two outside the widget foreground bounds.
This changeset updates this to have a nicer white-to-gray vertical
gradient. It also adds icons for the <merge> and <include> tags (not
used in the palette but can show up in the outline), and tweaks the
ScrollView and LinearLayout icons.
Change-Id: I1a887f7671d099918be7e63839ac76909ff554f6
Xavier Ducrohet [Tue, 25 Jan 2011 20:18:26 +0000 (12:18 -0800)]
ADT: Support class folders during build.
Change-Id: If1d6840082f96dd98c8be0658c6ce157b4801bd3
Tor Norbye [Tue, 25 Jan 2011 18:44:08 +0000 (10:44 -0800)]
Merge "Add icons for the rest of the views"
Tor Norbye [Mon, 24 Jan 2011 23:54:31 +0000 (15:54 -0800)]
Merge "Tweak TabHost drop handler"
Tor Norbye [Mon, 24 Jan 2011 23:52:18 +0000 (15:52 -0800)]
Add icons for the rest of the views
Add icons for all the remaining views, e.g. those that don't have
rendered previews.
A couple of these are scaled down icons from the platform (search for
search view, browser for web view, etc), and most of them are somewhat
ugly hand drawn placeholders.
Change-Id: I32b4e142f613003035c107f58aee7c2ecc2d017f
Xavier Ducrohet [Mon, 24 Jan 2011 22:15:37 +0000 (14:15 -0800)]
Merge "Add a MergeCookie class as a special-case view cookie."
Xavier Ducrohet [Mon, 24 Jan 2011 21:55:15 +0000 (13:55 -0800)]
Add a MergeCookie class as a special-case view cookie.
Change-Id: I6e2f55cf74a683cb936e16b469e1f5abe5a0fd83
Tor Norbye [Mon, 24 Jan 2011 18:41:41 +0000 (10:41 -0800)]
Merge "Icons for various widgets"
Tor Norbye [Mon, 24 Jan 2011 18:41:22 +0000 (10:41 -0800)]
Merge "Add palette category metadata"
Tor Norbye [Mon, 24 Jan 2011 17:36:36 +0000 (09:36 -0800)]
Merge "Fix computeSdkVersion initialization"
Tor Norbye [Mon, 24 Jan 2011 17:19:31 +0000 (09:19 -0800)]
Icons for various widgets
Add in 16x16 icons for many of the widgets. These icons are used in
the Outline, as well as in the "Text + Icons" and "Icons Only" modes
in the palette.
The icons were generated by rendering previews with transparency on,
and layoutlib5, with the theme "Theme.Light" (since that sets dark
text labels etc). It also used a special version of the rendering
config file where for example the label of the TextView is "Abc" in
bold rather than "TextView", where there is no text label on radio and
check buttons, etc. Some icons were scaled proportionally, others just
cropped left or right, etc. Those who were cropped on the right have a
small amount of alpha-fadeout on the right to work better in the
outline.
Change-Id: I419d1c98068696a5bc650060750713e45462f01c
Tor Norbye [Thu, 20 Jan 2011 22:39:23 +0000 (14:39 -0800)]
Tweak TabHost drop handler
Instead of creating a single tab, create 3 tabs instead, and pick a
better id since it's used as the tab label by the designtime TabSpec
creator.
Change-Id: I35ecb4ec8642431ff76a02d52f5194efd5909774
Tor Norbye [Thu, 20 Jan 2011 01:50:18 +0000 (17:50 -0800)]
Fix computeSdkVersion initialization
Change-Id: I0c8cc49eb403f207845ee8167872b6c318ee3b82
Tor Norbye [Thu, 20 Jan 2011 22:25:22 +0000 (14:25 -0800)]
Add palette category metadata
This changeset contains some background work for the palette preview
work, separated out to make that changeset smaller.
First, it creates a new metadata XML file, which augments the metadata
provided by the platform, defining things like palette categories, a
natural order for the views within each category. The older code-based
metadata for fill preferences (used to decide how to set the width and
height attributes on drop) are also moved into this XML file. There
will be more metadata added to this file in the next changeset, where
for example XML fragments defining how to render a view for preview
purposes will be defined there.
Second, change the signature on the view and layout descriptor lists
passed around such that we don't have to do instanceof
ViewElementDescriptor in various places.
Fix sentence capitalization for a couple of undo label strings.
Change-Id: I66191ccf4cc0f4105c2331d496f3674ac1ad8b9d
Raphael Moll [Wed, 19 Jan 2011 23:58:23 +0000 (15:58 -0800)]
Merge "ADT: Fix palette items to use full width."
Raphael Moll [Wed, 19 Jan 2011 23:03:04 +0000 (15:03 -0800)]
ADT: Fix palette items to use full width.
Change-Id: Ieb35e80de19f60b2fd724629374ad3a91832f0e9
Xavier Ducrohet [Wed, 19 Jan 2011 00:51:45 +0000 (16:51 -0800)]
Merge "Add renderscript support to the Ant build system."
Xavier Ducrohet [Tue, 11 Jan 2011 02:35:03 +0000 (18:35 -0800)]
Add renderscript support to the Ant build system.
Change-Id: Iba1c956d33725716923da89b788f7f8d14524e41
Xavier Ducrohet [Wed, 19 Jan 2011 00:16:06 +0000 (16:16 -0800)]
Merge "Parse the manifest min/targetSdkVersion to configure the layoutlib."
Xavier Ducrohet [Wed, 19 Jan 2011 00:15:37 +0000 (16:15 -0800)]
Merge "Move SDK Tools and ADT version to 10."
Xavier Ducrohet [Tue, 18 Jan 2011 23:23:52 +0000 (15:23 -0800)]
Move SDK Tools and ADT version to 10.
Change-Id: I6cfde67f2d0a0da2f94124d19e152e99df349820
Xavier Ducrohet [Tue, 18 Jan 2011 07:11:22 +0000 (23:11 -0800)]
Parse the manifest min/targetSdkVersion to configure the layoutlib.
This is needed to configure ApplicationInfo in the layoutlib
so that some widgets properly apply different behaviors based
on the app targetSdkVersion.
Change-Id: Ic78af4390d1b871469583f3efc0de3a9da718a6c
David Turner [Tue, 18 Jan 2011 21:56:28 +0000 (13:56 -0800)]
Merge "Add handling of proximity sensor"
The Android Open Source Project [Tue, 18 Jan 2011 07:36:28 +0000 (23:36 -0800)]
merge from tools_r9
Change-Id: I72c110fa93196b85eaf2da935af7ebf6006824dc
Raphael Moll [Tue, 18 Jan 2011 07:27:52 +0000 (23:27 -0800)]
Merge "Display AIDL cmd line in ADT Build Verbose mode." into tools_r9
The Android Open Source Project [Tue, 18 Jan 2011 07:01:56 +0000 (23:01 -0800)]
merge from tools_r9
Change-Id: I55fd5bd666040624c47c9794fdee0d0aa8ba43d7
Xavier Ducrohet [Tue, 18 Jan 2011 06:53:31 +0000 (22:53 -0800)]
Merge "Add min/targetSdkVersion to the LayoutLib API." into tools_r9
Xavier Ducrohet [Tue, 18 Jan 2011 06:48:40 +0000 (22:48 -0800)]
Add min/targetSdkVersion to the LayoutLib API.
This will allow some widgets to properly behave based on the
minSdkVersion and targetSdkVersion of the project during
rendering.
Change-Id: I96d432b8b92fbc211ce122da51bd18049708c14f
The Android Open Source Project [Tue, 18 Jan 2011 06:38:56 +0000 (22:38 -0800)]
merge from tools_r9
Change-Id: Ic0d0a3a2c8a5ee1d166d738334c0c2c7e7521363
Tor Norbye [Tue, 18 Jan 2011 06:35:02 +0000 (22:35 -0800)]
Merge "Update changes.txt to reflect work on issues #3162 and #13092" into tools_r9
Tor Norbye [Tue, 18 Jan 2011 06:25:54 +0000 (22:25 -0800)]
Update changes.txt to reflect work on issues #3162 and #13092
Change-Id: I48b7fd550069c455124f8fe0e468390805e3cfd8
The Android Open Source Project [Tue, 18 Jan 2011 06:15:55 +0000 (22:15 -0800)]
merge from tools_r9
Change-Id: Ib923c5ab4fc6e0e0916645c09506d334a8d68d63
Tor Norbye [Tue, 18 Jan 2011 06:12:47 +0000 (22:12 -0800)]
Merge "Configure TabHosts on drop" into tools_r9
Tor Norbye [Tue, 18 Jan 2011 06:11:40 +0000 (22:11 -0800)]
Merge "Fix error logging for null-message exceptions" into tools_r9
Tor Norbye [Tue, 18 Jan 2011 06:04:10 +0000 (22:04 -0800)]
Configure TabHosts on drop
Add a dummy child to the TabHost on drop.
Change-Id: I0f00dda449b81025c24933b6e1578b6b1a431272
Tor Norbye [Tue, 18 Jan 2011 04:48:08 +0000 (20:48 -0800)]
Fix error logging for null-message exceptions
Some exceptions (such as NullPointerException) can have null as their
getLocalizedMessage(). This meant that the render session could have
a result with a null message, but a non-null exception. This scenario
was not handled, for some error resulted in a failed result but no
details given.
Change-Id: I22c70cd09b3403e73e71ca971981b32026f00ad0
The Android Open Source Project [Tue, 18 Jan 2011 03:44:34 +0000 (19:44 -0800)]
merge from tools_r9
Change-Id: I02dd4e2e9d540dbac8f06986e96b9c2417efbb96
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
Raphael Moll [Tue, 18 Jan 2011 00:21:43 +0000 (16:21 -0800)]
Display AIDL cmd line in ADT Build Verbose mode.
Change-Id: I9d9091baac364671f0698becd33c87fba41edc7d
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
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