OSDN Git Service
Xavier Ducrohet [Tue, 1 Feb 2011 18:35:55 +0000 (10:35 -0800)]
Merge "Add Renderscript support to the ADT builders."
Xavier Ducrohet [Tue, 1 Feb 2011 01:22:59 +0000 (17:22 -0800)]
Add Renderscript support to the ADT builders.
This uses the new JavaGenerator mechanism so that all that's needed
is to run llvm-rs-cc on a given list and parsing the dependency file
that's created.
Change-Id: Ib4928c980422dfe1944bc720c77bf6ae5be4c34a
Xavier Ducrohet [Tue, 1 Feb 2011 03:45:11 +0000 (19:45 -0800)]
Merge "Change the JavaGenerator to handle output and dependencies."
Xavier Ducrohet [Mon, 31 Jan 2011 21:09:08 +0000 (13:09 -0800)]
Change the JavaGenerator to handle output and dependencies.
Previously, the generator only handled a list of files to compile
and a list of files that were removed.
Now the Generator provides all that needed to do incremental
builders with known state. On top of providing a default
deltavisitor it handles file dependency and list of output
files.
The aidl generator was updated to use this, and the renderscript
generator will use the same mechanism.
Also fixed the abortOnBadSetup which through CoreException which did
nothing to stop later builders (unlike my comments said) and
poluted the workspace log with worthless messages.
Change-Id: Ib954beb9674f1387c022f926388adb8faf6cdac2
Raphael Moll [Mon, 31 Jan 2011 23:34:16 +0000 (15:34 -0800)]
Merge "Fix android.bat to support CWD with & character"
Raphael Moll [Mon, 31 Jan 2011 23:03:37 +0000 (15:03 -0800)]
Fix android.bat to support CWD with & character
SDK Bug: 12862
Change-Id: Ib9508ce384b91a234e33834b19aaff6cc77e8ade
Xavier Ducrohet [Mon, 31 Jan 2011 18:52:09 +0000 (10:52 -0800)]
Merge "Respect Eclipse classpath when adding files to APK"
Dominic Mitchell [Thu, 25 Nov 2010 17:58:58 +0000 (17:58 +0000)]
Respect Eclipse classpath when adding files to APK
Iterating through the source folder may include files that the user has asked to be ignored.
http://code.google.com/p/android/issues/detail?id=12809
Change-Id: I18915cb8868feffe81499276923fec1415076186
Tor Norbye [Mon, 31 Jan 2011 06:22:00 +0000 (22:22 -0800)]
Merge "Guard against possible NPE."
Tor Norbye [Mon, 31 Jan 2011 04:54:58 +0000 (20:54 -0800)]
Guard against possible NPE.
Change-Id: I4be9b1659aa1394bea0f24f34fb4681e781b96ae
Xavier Ducrohet [Mon, 31 Jan 2011 04:09:55 +0000 (20:09 -0800)]
Merge "Refactor aidl handling in its own class."
Tor Norbye [Mon, 31 Jan 2011 02:41:45 +0000 (18:41 -0800)]
Merge "Cluster of improvements for merge tag views"
Tor Norbye [Mon, 24 Jan 2011 17:12:47 +0000 (09:12 -0800)]
Cluster of improvements for merge tag views
This changeset contains various improvements around usage of the
<merge> tag. Some of these fixes require layoutlib 5.
* Use the new layoutlib support for rendering multiple children at the
root level - they now show up in the Outline (provided you are
running layoutlib 5), can be selected in the layout editor, etc.
* Add a drop handler such that you can drag into the <merge> view and
get drop feedback (similar to the FrameLayout)
* If the <merge> is empty, we don't get any ViewInfos, so in that case
manufacture a dummy view sized to the screen. Similarly, if we get
back ViewInfos that are children of a <merge> tag in the UI model,
create a <merge> view initialized to the bounding rectangle of these
views and reparent the views to it.
* Support highlighting multiple views simultaneously when you select
an include tag that renders into multiple views (because the root of
the included layout was a <merge> tag). Similarly, make "Show
Included In" work properly for <merge> views, and make the overlay
mask used to hide all included content also reveal only the primary
selected views (when a view is included more than once.) (Also tweak
the visual appearance of the mask, and use better icon for the view
root in the included-root scenario.)
* Improve the algorithm which deals with render results with null
keys. Use adjacent children that -do- have keys as constraints when
attempting to match up views without keys and unreferenced model
nodes. This fixes issue
http://code.google.com/p/android/issues/detail?id=14188
* Improve the way we pick views under the mouse. This used to search
down the view hierarchy in sibling order. Instead, search in reverse
sibling order since this will match what is drawn in the layout. For
views like FrameLayout and <merge> views, the children are painted
on top of ech other, so clicking on whatever is on top should choose
that view, not some earlier sibling below it.
* Fix such that when you drag into the canvas, we *always* target the
root node, even if it is not under the mouse. This is particularly
important with <merge> tags, but this also helps if you for example
have a LinearLayout as the root element, and the layout_height
property is wrap_content instead of match_parent. In that case, the
LinearLayout will *only* cover its children, so if you drag over the
visual screen, it looks like you should be able to drop into the
layout, but you cannot since it only covers its children. With this
fix, all positions outside the root element's actual bounds are also
considered targetting the root.
* Fix broken unit test, add new unit tests.
Change-Id: Id96a06a8763d02845af4531a47fe32afe703df2f
Xavier Ducrohet [Mon, 31 Jan 2011 00:18:36 +0000 (16:18 -0800)]
Refactor aidl handling in its own class.
It extends a new base class that will serve as a base
class for the one handling renderscript files.
Change-Id: Ibef0c4b9a792fe52bf7b70bf5d24f76a15cb65c9
Xavier Ducrohet [Sun, 30 Jan 2011 22:41:37 +0000 (14:41 -0800)]
Merge "Traceview integration into Eclipse."
Pierre Zurek [Mon, 20 Dec 2010 01:31:37 +0000 (02:31 +0100)]
Traceview integration into Eclipse.
New plugin which adds a Traceview view to Eclipse.
Change-Id: I3001dfde6ed28db3de8a75715a0ba0743f5c29b0
Xavier Ducrohet [Sun, 30 Jan 2011 19:01:03 +0000 (11:01 -0800)]
Merge "Fix in PreferencePage."
Xavier Ducrohet [Sun, 30 Jan 2011 18:55:12 +0000 (10:55 -0800)]
Merge "Fix for issue 14189."
Tor Norbye [Sat, 29 Jan 2011 17:27:24 +0000 (09:27 -0800)]
Merge "Scale drag previews with the screen zoom"
Tor Norbye [Fri, 28 Jan 2011 15:42:05 +0000 (07:42 -0800)]
Scale drag previews with the screen zoom
If you have zoomed your layout, which is going to be common when
designing for 10" screens, then the drag preview shown when dragging
from the palette is not sized correctly. It assumes a 100% zoom.
This changeset looks at the current canvas zoom and scales the preview
image such that it matches the canvas zoom, so if you're zoomed in
then the preview will be larger, and vice versa.
Change-Id: I471b4d8ae459aad79d50a2b54ecca6bd7d7cf943
Tor Norbye [Sat, 29 Jan 2011 17:16:20 +0000 (09:16 -0800)]
Merge "Deemphasize AbsoluteLayout"
Tor Norbye [Sat, 29 Jan 2011 17:15:43 +0000 (09:15 -0800)]
Merge "Add support for multiple hyperlink targets"
Tor Norbye [Sat, 29 Jan 2011 01:01:49 +0000 (17:01 -0800)]
Add support for multiple hyperlink targets
This changeset makes the Go To Declaration hyperlink resolver produce
a list of possible jump targets. Therefore, if you for example point
at @android:string/ok, you will get a popup listing all the various
string.xml files that define a translation for this string. If there
is a current configuration (which would be the case if you are
pointing at a resource url from a layout file, but not from a Java
file or a manifest file) then the declaration which best matches the
configuration is listed first, followed by everything else in
alphabetical order by the folder name.
This uses the resource maps which the IDE is already maintaining for
rendering, so it can compute the set of hyperlinks cheaply.
In addition, the hyperlink resolver now goes to the direct declaration
of the given resource. This definition can in turn reference another
resource url.
There is one exception to the instant resolution of files: ids. In
layouts it's common to define ids in place (via @+id), and these are
not available in the resource map. Therefore, if no id is found
defined in a value folder, then the search is deferred until the link
is actually clicked. The search will now search not just the base
layout folder, but all layout folders, starting with the same folder
as the link source, followed by all configuration-compatible folders,
followed by all folders.
Change-Id: I20fd4f5836e41e5a9839124b7be3a3230f5198f4
Tor Norbye [Fri, 28 Jan 2011 03:42:29 +0000 (19:42 -0800)]
Deemphasize AbsoluteLayout
Move AbsoluteLayout out of the Layout category in the palette, and
into the "Advanced" category. Also add selection hints for the
absolute which explains that AbsoluteLayout is deprecated.
Change-Id: I2b1633e90794bdec7b7a0d3171f9a29eb25dd258
Pierre Zurek [Sun, 23 Jan 2011 22:15:51 +0000 (23:15 +0100)]
Fix for issue 14189.
Now the user can set if he wants to change perspective
when he double-clicks in the LogCat view.
If he wants to change perspective, he can set which
perspective shall be opened.
Change-Id: I3ed68f3f8ad3bbfcd6d161b63a0c0f218dd778b6
Xavier Ducrohet [Sat, 29 Jan 2011 01:49:30 +0000 (17:49 -0800)]
Merge "Add MipMap to the resource type list."
Xavier Ducrohet [Sat, 29 Jan 2011 01:23:46 +0000 (17:23 -0800)]
Add MipMap to the resource type list.
Change-Id: I1f56ab470874e39dad8659d15a3699b83f1ac658
Xavier Ducrohet [Sat, 29 Jan 2011 01:21:10 +0000 (17:21 -0800)]
Merge "Move Pair and annoatations into resources.jar now renamed as common.jar"
Xavier Ducrohet [Fri, 28 Jan 2011 23:18:32 +0000 (15:18 -0800)]
Move Pair and annoatations into resources.jar now renamed as common.jar
Move all the resource query methods that returned an array of 2 Strings
to return a pair of ResourceType and String.
Change-Id: I6b8447aa27005de786e2defef81ad88a72363523
Tor Norbye [Fri, 28 Jan 2011 20:55:40 +0000 (12:55 -0800)]
Merge "Fix compilation errors due to 2 independent changes."
Xavier Ducrohet [Fri, 28 Jan 2011 20:52:13 +0000 (12:52 -0800)]
Fix compilation errors due to 2 independent changes.
Change-Id: Ib7aa41aa6c95ec17ffde2644320b851f8f02f85f
Xavier Ducrohet [Fri, 28 Jan 2011 20:42:37 +0000 (12:42 -0800)]
Merge "Change APIs using String instead of ResourceType."
Tor Norbye [Fri, 28 Jan 2011 20:42:32 +0000 (12:42 -0800)]
Merge "Improve QuickContactBadge designtime"
Xavier Ducrohet [Fri, 28 Jan 2011 02:05:56 +0000 (18:05 -0800)]
Change APIs using String instead of ResourceType.
Move ResourceType into resources.jar so that it's accessible
to layoutlib.jar
This is cleaner and allows us to us more efficient EnumMap objects.
Change-Id: If11cbc69ae3ca8bd6c96e6d0ef402570a07af16f
Raphael Moll [Fri, 28 Jan 2011 06:27:01 +0000 (22:27 -0800)]
Merge "Fix clean script."
Raphael Moll [Fri, 28 Jan 2011 06:23:50 +0000 (22:23 -0800)]
Fix clean script.
The way bash works, the script returns the status of the last command.
In this case, the last failed test's return value is what the script
returns, even when that's what we want. Encapsulating the test in
a function works around this.
Change-Id: I44de75d80b2d16ca4110f078d40db0f71f1aa400
Tor Norbye [Thu, 27 Jan 2011 23:44:33 +0000 (15:44 -0800)]
Improve QuickContactBadge designtime
Don't set the image src attribute on drop (which was done by the
ImageViewRule since QuickContactBadge extends ImageView), and don't
use the mail contact image in the render-config.
Change-Id: I182c5e253bb754d8ae5fc54583f6a06ad3415ad0
Tor Norbye [Fri, 28 Jan 2011 00:28:39 +0000 (16:28 -0800)]
Merge "Various palette improvements"
Tor Norbye [Thu, 27 Jan 2011 03:33:37 +0000 (19:33 -0800)]
Various palette improvements
1. Look up the theme background and foreground colors using theme
resources, if possible. These theme resources are then used to set
the foreground and background colors on the labels used as a
fallback for non-previewable widgets. In other words, when you're
looking at a dark theme, the layouts such as LinearLayout is now
shown using a white label on a dark background, making the palette
view more consistent visually.
2. Configure scrollbar increments properly such that scrolling the
views with scrollwheels or mouse gestures works better.
3. Fix a bug in the way preview images were copied out of the rendered
image; the root coordinates were not taken into account, which
matters for themes like Theme.Dialog.
Change-Id: I4832166a0560d33fe4e4dd8079c82a180e07e897
Xavier Ducrohet [Thu, 27 Jan 2011 23:43:36 +0000 (15:43 -0800)]
Merge "Update the Layoutlib API to contain part of the current config."
Xavier Ducrohet [Thu, 27 Jan 2011 21:10:25 +0000 (13:10 -0800)]
Update the Layoutlib API to contain part of the current config.
Right now only the screen size is needed. We can add more to Params
as needed.
Since we should use the existing enum classes for this, I moved
all the current enum from sdklib into a new jar file called
resources.jar.
ADT, sdklib, layoutlib_api all depend on it.
Changes to resources should always be API compatible and the result
should be copied into the in-dev platform branch in prebuilt, similar
to layoutlib_api. See the README.txt files in layoutlib_api/ and
resources/
Change-Id: I877ba3cad555ec497954bb0866639e51e7751020
Tor Norbye [Thu, 27 Jan 2011 22:10:47 +0000 (14:10 -0800)]
Merge "Replace Properties.load(Reader) with Properties.load(InputStream)"
Raphael Moll [Thu, 27 Jan 2011 22:09:07 +0000 (14:09 -0800)]
Merge "Change pluging copyright date to 2011."
Tor Norbye [Thu, 27 Jan 2011 21:44:49 +0000 (13:44 -0800)]
Replace Properties.load(Reader) with Properties.load(InputStream)
Change-Id: Ic378b53448f7ae73493ec692ba77ed35c908ed86
Raphael Moll [Sat, 22 Jan 2011 07:52:55 +0000 (23:52 -0800)]
Change pluging copyright date to 2011.
SDK bug 14206
Change-Id: I85c8ef070527ba0cc361caa28d3325f736d0b5c8
Xavier Ducrohet [Thu, 27 Jan 2011 18:00:54 +0000 (10:00 -0800)]
Merge "Add more theme query APIs to RenderResources"
Xavier Ducrohet [Thu, 27 Jan 2011 18:00:50 +0000 (10:00 -0800)]
Merge "Properly convert the rendered layout images if alpha is needed."
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
Jeff Brown [Wed, 26 Jan 2011 22:25:13 +0000 (14:25 -0800)]
Merge "Move keymaps to frameworks/base/data/keyboards."
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"
Jeff Brown [Wed, 26 Jan 2011 03:09:04 +0000 (19:09 -0800)]
Move keymaps to frameworks/base/data/keyboards.
Change-Id: I787601e3ab3ac4ce3d5ef5691788af62abbf91e9
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
Pierre Zurek [Sun, 23 Jan 2011 22:16:48 +0000 (23:16 +0100)]
Fix in PreferencePage.
When the user clicked on the "Restored Defaults" button,
the "ADBHOST value:" field could still be enabled while
the "Use ADBHOST" field was disabled.
This commit fixes the problem.
Change-Id: Id5948fed655a7034a65cb96b509e1ad80226a93b
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