OSDN Git Service
The Android Open Source Project [Wed, 4 May 2011 14:22:21 +0000 (07:22 -0700)]
merge from tools_r7
Change-Id: Iaa0b32605af28453518bd5f9868eb682d7ae95d6
Brett Chabot [Tue, 3 May 2011 23:04:17 +0000 (16:04 -0700)]
Merge "Merge "Fix emulator GPS support"" into tools_r7
Mike Lockwood [Tue, 15 Feb 2011 04:54:04 +0000 (23:54 -0500)]
Merge "Fix emulator GPS support"
Use create_thread_cb instead of pthread_create to create gps_state_thread
so it can safely call into the Java framework.
BUG:
3375089
Signed-off-by: Mike Lockwood <lockwood@android.com>
(cherry picked from commit
11e72f25bfc05bef01ef1198dc9c9f5f7ee4ec52)
Change-Id: I73f04a3589f14121e8827120e3f182432b1ec5b8
The Android Open Source Project [Tue, 3 May 2011 17:45:14 +0000 (10:45 -0700)]
merge from tools_r10
Change-Id: Ied77b0ff73c6a049c183cd511d740773ac4254a7
Raphael Moll [Tue, 3 May 2011 00:33:35 +0000 (17:33 -0700)]
Merge "Remove banner printed when starting 'android' tool UI."
Raphael Moll [Tue, 3 May 2011 00:33:08 +0000 (17:33 -0700)]
Merge "SdkManager: handle missing platforms/ and add-ons/ folders."
Tor Norbye [Mon, 2 May 2011 23:38:17 +0000 (16:38 -0700)]
Merge "Improve custom view search and filtering"
Tor Norbye [Mon, 2 May 2011 23:37:51 +0000 (16:37 -0700)]
Merge "Misc fixes"
Raphael [Mon, 2 May 2011 23:33:44 +0000 (16:33 -0700)]
Merge "Fix tools_r10 SDK build." into tools_r10
Tor Norbye [Sat, 30 Apr 2011 00:30:01 +0000 (17:30 -0700)]
Improve custom view search and filtering
This change improves the code which identifies custom views in the
project.
It will now filter out a number of "false" matches:
- Classes that were only defined in a javadoc (these are included in
Eclipse type hierarchy search results)
- Anonymous classes
- Classes that extend View, but do not define one of the 3 base View
constructors:
View(Context context)
View(Context context, AttributeSet attrs)
View(Context context, AttributeSet attrs, int defStyle)
We can only instantiate custom views with one or more of these
constructor signatures at designtime.
It also fixes two additional bugs:
- It changes the search flags passed to the search engine which makes
it now find custom views that are static innerclasses.
- It fixes a bug in handling view descriptors which made the custom
view palette not work at all in some projects (in some case the
descriptor would be null, which caused an NPE which caused the whole
palette initialization to bail.) This is the bug which made me dig
through the custom view code and discover the above problems too.
Change-Id: I4bdb4c88555afb6d7451f506e1be74e757e81593
Raphael [Mon, 2 May 2011 23:31:54 +0000 (16:31 -0700)]
Fix tools_r10 SDK build.
We activated the sdk_repo build option, which means to generate
the repository XML we need some min-tools-rev info defined in the
tools source props.
Change-Id: I01fecc45bc1317c0e746815924ac8afe04491ad5
Tor Norbye [Mon, 2 May 2011 23:25:07 +0000 (16:25 -0700)]
Merge "Add "Reset" to palette context menu"
Tor Norbye [Mon, 2 May 2011 20:47:35 +0000 (13:47 -0700)]
Add "Reset" to palette context menu
This CL adds a "Reset" item to the context menu in the palette, which
resets the palette back to the default mode -- alphabetical sort off,
categories on, scaled previews.
Change-Id: I2d6c65a905f3b2f7c164475ddb7bcaeff7f5e6e3
Tor Norbye [Mon, 2 May 2011 23:21:02 +0000 (16:21 -0700)]
Merge "Add Request Focus to textfields"
Tor Norbye [Mon, 2 May 2011 20:40:02 +0000 (13:40 -0700)]
Misc fixes
This changeset fixes a couple of misc problems I ran into:
(1) Save the current file when double clicking on an included view.
When double clicking on an included view, the included view is
opened in a "Show Included" context where the including file is
surrounding the include. This will read the surrounding file from
disk, and if we don't save the file when opening the file then
it's possible to see a stale view (best case) or it won't work at
all if the include tag itself isn't in the saved version of the
file.
(2) Fix a bug in the "Select Same Type" context menu action where the
list was cleared before reading out the item to be selected.
(3) Filter out a few more properties from the Extract Style
refactoring dialog, and include margin attributes
Change-Id: I207cc5b736aacd3f067d6d36727ffcd7104a87c1
Tor Norbye [Mon, 2 May 2011 23:11:40 +0000 (16:11 -0700)]
Merge "Displaying a file name to window title, when a image is loaded in draw9patch tool."
Tor Norbye [Mon, 2 May 2011 22:57:02 +0000 (15:57 -0700)]
Add Request Focus to textfields
This changeset adds a couple of focus related changes:
1) When the first text field is added into a layout, it is
automatically requesting focus
2) There is a new context menu item available on textfields to request
focus. When invoked on a text field, it will both add
<requestFocus> to itself and remove it from any other text fields
that have set it in the layout. When invoked on a text field which
already has focus, it will offer to clear the focus.
3) The Advanced section of the palette also contains the
<requestFocus> tag.
Change-Id: I92982b6dfc17315b3d513c304f258b8901a007a4
Raphael Moll [Mon, 2 May 2011 22:36:08 +0000 (15:36 -0700)]
Remove banner printed when starting 'android' tool UI.
When running the 'android' tool from command-line,
it prints a banner indicating it will start its UI
since no parameters were given. This CL removes this,
it no longer seem that useful, does it?
Change-Id: I6f99cdbde2257b12c9676c2fade1e1fc8a5c38a0
Raphael Moll [Mon, 2 May 2011 21:24:26 +0000 (14:24 -0700)]
SdkManager: handle missing platforms/ and add-ons/ folders.
A while ago, when we were dealing with monolithics SDKs,
the strategy was that we wanted to make sure that
the 'android' command was invoked from a properly setup
SDK folder. Consequently the SdkManager required at least
the platforms/ and add-ons/ folders to be present, even if
empty.
I don't think that behavior is really necessary anymore.
The 'android' tool is invoked with knowledge from its tools
folder, so we can safely assume the top parent is "the SDK
folder" and create these directories if they are missing.
We do however try to create them as early as possible if
they are missing, so that the tool aborts early if we can't
create them. The other alternative would be to just try to
create them when we're actually installing a package.
Change-Id: I8ea58f23add89c2dac0a22142f6fb5e71b8203aa
Raphael Moll [Mon, 2 May 2011 20:56:37 +0000 (13:56 -0700)]
Merge "Fix typos in READMEs."
Raphael Moll [Mon, 2 May 2011 20:13:28 +0000 (13:13 -0700)]
Fix typos in READMEs.
This addresses some CL feedback from last week.
Change-Id: I1a121b3f294a395eb0f660d962c65c48d1760d7b
David 'Digit' Turner [Mon, 2 May 2011 11:36:24 +0000 (04:36 -0700)]
Merge "emulator: qemud: shut-up debug messages."
David 'Digit' Turner [Mon, 2 May 2011 11:34:26 +0000 (13:34 +0200)]
emulator: qemud: shut-up debug messages.
This change is already under development/tools/emulator/system/qemud/qemud.c
However, this sdk/.../qemud.c source file was first deleted, then reverted,
with the change in between. So apply it here too.
Change-Id: Ib79e0e7260c392fb886b39ff5494837e045cdf1a
Raphael Moll [Fri, 29 Apr 2011 16:29:40 +0000 (09:29 -0700)]
Merge "Use SwtMenuBar in HierarchyViewer application."
Raphael Moll [Fri, 29 Apr 2011 16:29:35 +0000 (09:29 -0700)]
Merge "Fix image reousrces in HierarchyViewer application."
Raphael Moll [Fri, 29 Apr 2011 16:29:26 +0000 (09:29 -0700)]
Merge "Use SwtMenuBar for DDMS."
Raphael Moll [Fri, 29 Apr 2011 15:44:34 +0000 (08:44 -0700)]
Merge "Fix build (due to previous AvdInfo refactoring)."
Raphael Moll [Fri, 29 Apr 2011 15:43:08 +0000 (08:43 -0700)]
Fix build (due to previous AvdInfo refactoring).
Change-Id: I09e405963817089f5af53d23f2cafa21e15b6ec9
Raphael Moll [Fri, 29 Apr 2011 06:22:09 +0000 (23:22 -0700)]
Use SwtMenuBar in HierarchyViewer application.
Change-Id: I5f61e0c238520d8582e9bef8fa69c354a1165475
Raphael Moll [Fri, 29 Apr 2011 03:07:49 +0000 (20:07 -0700)]
Fix image reousrces in HierarchyViewer application.
Currently the HierarchyViewer application crashes when
trying to run it from Eclipse. The issue is that the
code looks for all the images in /images/ whereas the
source code places them in /resources/images/ and the
makefile was setup to "erase" the /resources part.
The fix is:
- move all images back to hierarchyviewerlib/src/images.
- adjust the makefile accordingly.
Another issue is that the about box JPEG files failed
to load (at least on Eclipse 3.5 under Win7). That's OK
we had a real icon in PNG that works, so we should be
using it for the about box anyway.
Change-Id: Id3edc3d714480d4251b190706371db2481a14b63
Raphael Moll [Thu, 21 Apr 2011 20:55:58 +0000 (13:55 -0700)]
Use SwtMenuBar for DDMS.
Change-Id: I32121a336e5b3256ef1661fff5afe84741295d08
Raphael Moll [Fri, 29 Apr 2011 01:37:16 +0000 (18:37 -0700)]
Merge "Fix SdkManager unit tests. Refactor AvdInfo."
Raphael Moll [Tue, 26 Apr 2011 20:41:18 +0000 (13:41 -0700)]
Fix SdkManager unit tests. Refactor AvdInfo.
A couple issues with the current unit tests:
- It was correctly allocating a temporary SDK folder.
- It was correctly creating temporary AVDs in a temp folder.
- However it was still using the regular AVD root for the
AVD ini files and leaving them behind.
- Minor windows dir-sep issue.
This replaces the SdkManagerTestUtils class by a
new base TestClass specific to SDK testing that creates
both the temporary SDK and AVD manager and correctly overrides
the AVD root.
One issue is that we have different ways to find what the
correct AVD Root is and the default paths used for an AvdInfo
where setup using static methods, making them impossible to
override in unit tests.
This refactors AvdInfo out of AvdManager and most important
there's a single non-static method, AvdManager.getBaseAvdFolder(),
that is used to know where AVDs should be stored.
Change-Id: I4270203f52de15ca9418e9b4f1bf61dbc843c218
Raphael Moll [Thu, 28 Apr 2011 19:11:29 +0000 (12:11 -0700)]
Merge "Add missing OSGI jar to DDMS classpath."
Raphael Moll [Thu, 28 Apr 2011 19:10:58 +0000 (12:10 -0700)]
Merge "Cocoa implementation for SwtMenuBar."
Raphael Moll [Thu, 28 Apr 2011 05:34:52 +0000 (22:34 -0700)]
Add missing OSGI jar to DDMS classpath.
DDMS requires an osgi.jar, which is correctly
declared in the manifest. It is however not
declared in the classpath used by Eclipse.
The consequence is that trying to use the pref
panel when running ddms from eclipse crashes
with with a ClassNotFound exception.
Change-Id: I204232a608be0da584577d13f5649d03bb542976
Raphael Moll [Wed, 27 Apr 2011 02:05:02 +0000 (19:05 -0700)]
Cocoa implementation for SwtMenuBar.
Note that in the Android SDK tools, we ship:
- SWT in 32-bit with Carbon only.
- SWT in 64-bit with Cocoa only.
The previous implementation was carbon-only and the
menus were basically not 'macified' when running on
a recent Mac from the command-line. This missing
implementation fixes it.
After experimenting with various implementations of
the original SWT CocoaMenuEnhancer, I finally settled with
this one since it solely uses reflection and does not
import anything from the swt.cocoa namespace. This means
we can easily build this using the makefile which *only*
links with the 32-bit/carbon version of SWT.jar.
Note that on Windows/Linux, the src-darwin folder will
be ignored, which is why it is not mapped as a source
directory and which is why we can't build this directly
from Eclipse.
Change-Id: I53859d3b15bc7026d6bd4f77e048a0c4b4eeb02c
Raphael Moll [Tue, 26 Apr 2011 20:48:22 +0000 (13:48 -0700)]
Merge "Script-compatible output for list avds and list targets."
Raphael Moll [Tue, 26 Apr 2011 19:07:17 +0000 (12:07 -0700)]
Script-compatible output for list avds and list targets.
This adds the following options to the "android"
command line to make it easier to use the outputs
from scripts:
$ android list avds --compact --null
$ android list targets --compact --null
The short version is '-c -0'.
--compact or -c outputs *justs* the AVD names or the
target identifiers (usable for --target arguments).
with no other information, one per line.
--null or -0 switches EOL from \n to \0, which allows
scripts to process target names with spaces using
xargs -0 or similar.
Change-Id: I18e6ee6b431ed69913a6df37ce34e17ecc721035
The Android Open Source Project [Fri, 22 Apr 2011 01:37:45 +0000 (18:37 -0700)]
reconcile tools_r7 into master - no actual change
Change-Id: Ie78147bad738f0c05d9c0869fa18c4a419afaef8
The Android Open Source Project [Fri, 22 Apr 2011 01:30:08 +0000 (18:30 -0700)]
reconcile tools_r10 into master - no actual change
Change-Id: I96548afd392c79ef1b0decafdaa5b03703209120
Xavier Ducrohet [Thu, 21 Apr 2011 23:37:45 +0000 (16:37 -0700)]
Merge "When possible use File.setExecutable instead of doing an exec of chmod."
Xavier Ducrohet [Thu, 21 Apr 2011 23:17:12 +0000 (16:17 -0700)]
When possible use File.setExecutable instead of doing an exec of chmod.
Change-Id: I2b2f79bb07e277a1f2caa62b4100cbd8f7e8328d
Xavier Ducrohet [Thu, 21 Apr 2011 18:41:10 +0000 (11:41 -0700)]
Merge "When unarchiving install, files that need +x don't need +w too."
Xavier Ducrohet [Thu, 21 Apr 2011 17:54:50 +0000 (10:54 -0700)]
When unarchiving install, files that need +x don't need +w too.
Change-Id: I860c28fa979a1d8673abd9690014b8b28c6e8d7e
Tor Norbye [Wed, 20 Apr 2011 23:53:47 +0000 (16:53 -0700)]
Merge "Enforce at most one child on ScrollViews, and add LinearLayouts"
Tor Norbye [Fri, 1 Apr 2011 01:16:58 +0000 (18:16 -0700)]
Enforce at most one child on ScrollViews, and add LinearLayouts
This changeset fixes issue
15899: Scroll view can only have one child and editor should enforce
this.
First, it modifies the view rules for ScrollView and HorizontalView to
refuse to add children to the view if there is already a child
there. It also updates the drawing code to not offer drop previews
other than the target highlighting rectangle.
Second, it modifies the New XML File wizard to insert a vertical
LinearLayout as the new child when a ScrollView or
HorizontalScrollView is created. (This was already done by the view
rules when the scroll views were dragged in from the palette.)
Change-Id: Ide825cbf28b46177983d6c5f2ea8c2848147c711
Tor Norbye [Wed, 20 Apr 2011 23:50:01 +0000 (16:50 -0700)]
Merge "Custom listview layouts"
Tor Norbye [Tue, 12 Apr 2011 06:05:47 +0000 (23:05 -0700)]
Custom listview layouts
This changeset adds support for user-configured layouts in ListViews
and ExpandableListViews.
There is a new "Preview List Content" pullright menu when you right
click on a ListView in the layout canvas. The menu contains links to
configure
- the layout to use for list view items
- the layout to use as a header
- the layout to use as a footer
- as well as a number of pre-configured framework layouts for common
arrangements like 2-item list, 1-item list, checked list, etc.
The selected layout is persisted as an inline comment in the layout
XML. (Current bug: When you drag elements around in the layout,
comment nodes are not preserved, meaning you will lose your list view
render type as well.)
This changeset also adds "Clear" to the resource chooser, which makes
it possible to clear a previously set value (until this, choosing
nothing would simply abort the selection.) This makes it possible to
remove a chosen header/footer.
Change-Id: I611b00f627c5773f3fe2443a6e16c29388687b36
Xavier Ducrohet [Wed, 20 Apr 2011 21:45:12 +0000 (14:45 -0700)]
Merge "Move getParser(name) into IProjectCallback."
Xavier Ducrohet [Mon, 18 Apr 2011 23:16:07 +0000 (16:16 -0700)]
Move getParser(name) into IProjectCallback.
Change-Id: I316f03a9903e90eac0cb8059469c1de5b679dac5
Tor Norbye [Wed, 20 Apr 2011 19:40:37 +0000 (12:40 -0700)]
Merge "Fix menu editor such that it works for empty files"
Tor Norbye [Wed, 20 Apr 2011 16:48:15 +0000 (09:48 -0700)]
Fix menu editor such that it works for empty files
Some users have reported the IDE hanging when they create menu
resource files. This happens if they create a "plain" file and name
it XML, rather than using the "New Android XML File" or "New XML File"
templates. The reason this happens is that the initialization code in
the MenuEditor ends up with unbounded recursion where the
initialization code triggers itself.
Change-Id: Icfbc295bbf5cecac216fdff5144cbdb62211da6a
Raphael Moll [Wed, 20 Apr 2011 01:31:18 +0000 (18:31 -0700)]
Merge "Fix duplicate dependencies reported by SDK installer."
Raphael Moll [Tue, 19 Apr 2011 22:55:25 +0000 (15:55 -0700)]
Fix duplicate dependencies reported by SDK installer.
The issue was simply that when finding dependencies
we have several rules that overlap and we just need
to take the union of what we find. For example an
add-on needs to comply with both the IPlatformDependency
and the IExactApiLevelDependency, which is why it was
erroneously listed twice.
SDK Bug: http://code.google.com/p/android/issues/detail?id=16239
Change-Id: Idb0895a0d2aa063d0a3a7f5d6a2c9ddd6959e0f6
Xavier Ducrohet [Tue, 19 Apr 2011 19:36:52 +0000 (12:36 -0700)]
Merge "Make sure 'gen' folder is never derived."
Xavier Ducrohet [Tue, 19 Apr 2011 18:56:11 +0000 (11:56 -0700)]
Make sure 'gen' folder is never derived.
That would delete it when cleaning the project which is not
good since it takes a while to refresh and to recreate it
through the ResourceManagerBuilder.
Change-Id: I4c050bdc37b8aa78abf7463baf8d19115b032fb2
Tor Norbye [Mon, 18 Apr 2011 22:01:58 +0000 (15:01 -0700)]
Merge "Cache resource resolver and manifest info"
Tor Norbye [Fri, 15 Apr 2011 21:28:27 +0000 (14:28 -0700)]
Cache resource resolver and manifest info
This changeset adds caching of the ResourceResolver in the layout
editor such that it can be reused for successive rendering requests as
long as the configuration does not change.
It also adds caching of the manifest icon and label; these are
invalidated whenever the manifest file is updated and saved.
Change-Id: Idbf77fd96fa60a4ac24e06bbecae882829a8b812
Tor Norbye [Mon, 18 Apr 2011 21:47:32 +0000 (14:47 -0700)]
Merge "Suggest application and activity name in New Project wizard"
Raphael Moll [Mon, 18 Apr 2011 21:26:26 +0000 (14:26 -0700)]
Merge "SDK Manager: fix extra package update detection." into tools_r10
Xavier Ducrohet [Mon, 18 Apr 2011 21:04:34 +0000 (14:04 -0700)]
Merge "Add getViewBaseline to the LayoutLibrary class."
Tor Norbye [Mon, 18 Apr 2011 16:55:52 +0000 (09:55 -0700)]
Suggest application and activity name in New Project wizard
This changeset tweaks the "New Android Project" wizard such that the
Application name and the Activity name fields are automatically
populated with some reasonable defaults.
This is done by syncing the project name while it is being edited to
the application name and to the activity name (plus "Activity").
Also, if the application name is manually edited it will also be
synced to the activity name.
Note that as soon as a text field is manually edited, it will no
longer be updated when the project name is edited.
Furthermore, selecting a target in the SDK target chooser will set the
API level of the chosen target as the minimum SDK in the min SDK value
field.
Change-Id: I2391eda334c6c422cce707971d340124742cbb52
Xavier Ducrohet [Mon, 18 Apr 2011 20:14:47 +0000 (13:14 -0700)]
Add getViewBaseline to the LayoutLibrary class.
Change-Id: I29caadc8cb31c4a3aab0863a4fec16534b9bc900
Raphael Moll [Sat, 19 Feb 2011 01:02:29 +0000 (17:02 -0800)]
SDK Manager: fix extra package update detection.
(cherry picked from commit
fcb38f8f3ee58bbac65340c4878f8ab66431ddb6)
Change-Id: I44eeeb06dd406beb8ab53288da7b1eca3f74edad
Raphael Moll [Sat, 16 Apr 2011 01:03:23 +0000 (18:03 -0700)]
Merge "Change logging API used by ITaskMonitor."
Raphael Moll [Fri, 15 Apr 2011 23:34:28 +0000 (16:34 -0700)]
Change logging API used by ITaskMonitor.
ITaskMonitor is used by the SDK Manager to display
status information and progress bar for asynchronous
tasks (e.g. fetching sources, downloading and installing
packages).
This changes the way text is logged by the monitor.
There used to be one setResult() method which historically
was designed to report 1 final message (e.g. "Install
completed") but then this was actually used to add
ongoing logging. So in this change the monitor has
3 replacement methods: log, logError and logVerbose,
which gives us more flexibility in controlling what
gets displayed.
As a side effect, this fixes unit-tests from SdkLib
that relied on previous output that changed in a
recent CL.
Change-Id: I0fa41d59db8f5eea478b88208695ef07e246ba30
Tor Norbye [Fri, 15 Apr 2011 22:43:03 +0000 (15:43 -0700)]
Merge "Ensure that canvas zoom is non-zero"
Tor Norbye [Fri, 15 Apr 2011 22:42:54 +0000 (15:42 -0700)]
Merge "Make Extract Include search in all files"
Raphael Moll [Fri, 15 Apr 2011 21:42:17 +0000 (14:42 -0700)]
Merge "Use swtmenubar in SDK Manager 2."
Raphael Moll [Fri, 15 Apr 2011 21:41:51 +0000 (14:41 -0700)]
Merge "swtmenubar library for the SDK."
Tor Norbye [Fri, 15 Apr 2011 20:19:51 +0000 (13:19 -0700)]
Ensure that canvas zoom is non-zero
Ensure that the canvas zoom is always greater than zero. This is a
safeguard against a scenario where the "compute best fit" code runs
too early where the SWT window bounds are 0 and the wrong value gets
computed.
Change-Id: I1519270f42c5a848fa0756f2f40cf6af69bb1865
Raphael Moll [Fri, 15 Apr 2011 20:06:41 +0000 (13:06 -0700)]
Merge "SDK Manager command line install improvements."
Tor Norbye [Fri, 15 Apr 2011 19:32:01 +0000 (12:32 -0700)]
Make Extract Include search in all files
This changeset makes the "Extract Include" refactoring search not just
the configuration-variations of the layout it was invoked on, but it
will look for semantically identical XML fragments in all layouts in
the same project, and will offer to replace each one of them with the
new include.
Change-Id: I03abf9e285d416e91b45eec7e01f518ea8d017d9
Raphael Moll [Thu, 14 Apr 2011 06:55:32 +0000 (23:55 -0700)]
Use swtmenubar in SDK Manager 2.
This is experimental and not completely hooked up.
Change-Id: I4f4892be64f5592d909496e3c9e69c76002397d0
Raphael Moll [Thu, 14 Apr 2011 06:51:39 +0000 (23:51 -0700)]
swtmenubar library for the SDK.
This little EPL library provides a way for the SDK apps to integrate
with the Mac menu bar -- that is correctly hook into the About and
Preferences menu items.
On other platforms (Windows, Linux), corresponding items are
added to the provided menu.
The library provides both a Carbon and a Cocoa implementation.
However the Cocoa implemented is currently commented out since
we only link with a Carbon-aware version of SWT.jar.
Added a README that explain how to use this.
Change-Id: I4b8457f0269946df056b5dd597c7263da1c4e784
Brett Chabot [Fri, 15 Apr 2011 17:25:27 +0000 (10:25 -0700)]
Merge "Throw SyncException if local file is not found instead of FileNotFoundException."
Brett Chabot [Fri, 15 Apr 2011 01:23:31 +0000 (18:23 -0700)]
Throw SyncException if local file is not found instead of FileNotFoundException.
Bug 16159
Change-Id: I13903487786b61398553a69ad09220defa78d588
Xavier Ducrohet [Fri, 15 Apr 2011 01:21:14 +0000 (18:21 -0700)]
Merge "Add Baseline utility method to layoutlib's bridge."
Xavier Ducrohet [Fri, 15 Apr 2011 00:39:02 +0000 (17:39 -0700)]
Add Baseline utility method to layoutlib's bridge.
Change-Id: I580dad3b15de028b299a0c75e206bb31b5d6d062
Bill Napier [Thu, 14 Apr 2011 16:56:36 +0000 (09:56 -0700)]
Merge "Separate MonkeyRunner core logic"
David 'Digit' Turner [Thu, 14 Apr 2011 14:19:37 +0000 (07:19 -0700)]
David 'Digit' Turner [Thu, 14 Apr 2011 12:13:44 +0000 (14:13 +0200)]
Revert
183675b74e5a58211e5d9a90a9ca86546ed3e245
Unfortunately, we need to keep the duplicate libraries here to prevent
breaking a few internal branches for now.
Remove obsolete emulator modules
The corresponding modules have all been moved to development/tools/emulator/system/
already. Note that we use a global variable Make trick to prevent the same module
from being built twice, so removing these files doesn't break the builds.
Another patch should remove the global variable Make trick from
development/tools/emulator/system after this patch.
Change-Id: I97332216b311608de61919cb75f4b760b249c0d9
Adrian Zakrzewski [Mon, 11 Apr 2011 11:10:53 +0000 (13:10 +0200)]
Separate MonkeyRunner core logic
Refactored the MonkeyRunner code to separate core logic
from the jython wrapper. The core logic is now usable
directly from Java w/o the pollution from jython.
The existing MonkeyRunner classes are now just a thin
and dumb wrapper atop the core.
Change-Id: I6ef18ea92e0e9284c1fde949b4efb0e2e7170e57
Brett Chabot [Wed, 13 Apr 2011 22:46:21 +0000 (15:46 -0700)]
Merge "Bundle ninepatch tests resources in jar."
Keiji Ariyama [Wed, 13 Apr 2011 16:59:35 +0000 (01:59 +0900)]
Displaying a file name to window title, when a image is loaded in draw9patch tool.
Change-Id: Iad52e227696403752c6deea590b183c74624c12b
Bill Napier [Wed, 13 Apr 2011 15:38:53 +0000 (08:38 -0700)]
Merge "Update monkeyrunner script to find SWT."
Terence Haddock [Mon, 11 Apr 2011 09:12:11 +0000 (11:12 +0200)]
Update monkeyrunner script to find SWT.
Change-Id: I75fca4620dc70ffa71d2255aff989e655be8bc16
Brett Chabot [Wed, 13 Apr 2011 02:41:25 +0000 (19:41 -0700)]
Bundle ninepatch tests resources in jar.
Change-Id: Ie3efc7f35908b77e6dd9fcffcea3a5d24a8fd45b
Tor Norbye [Wed, 13 Apr 2011 01:13:31 +0000 (18:13 -0700)]
Merge "Highlight current drop target in the outline"
Tor Norbye [Wed, 13 Apr 2011 01:13:03 +0000 (18:13 -0700)]
Merge "Make drop recipient rectangle slightly thicker"
Tor Norbye [Tue, 12 Apr 2011 16:29:55 +0000 (09:29 -0700)]
Make drop recipient rectangle slightly thicker
Change-Id: Ieab4b1c3635c64972522eb3d7cea3eafbdbaaf66
Tor Norbye [Tue, 12 Apr 2011 15:52:07 +0000 (08:52 -0700)]
Highlight current drop target in the outline
During a canvas drag & drop operation, highlight the current target
node in the outline. This helps make it obvious which target you are
hitting in cases where it's ambiguous, such as when you have a
hierarchy of parents with mostly overlapping bounds, such as a
TableLayout with TableRows inside.
Change-Id: I7fc4aa23afccb7da4ab5eba14730c7a2c8064782
Tor Norbye [Tue, 12 Apr 2011 00:04:04 +0000 (17:04 -0700)]
Merge "Add list view preview"
Tor Norbye [Wed, 6 Apr 2011 14:52:13 +0000 (07:52 -0700)]
Add list view preview
Use the new layoutlib facility to specify adapter view bindings to
assign default listview item layouts to ListViews and
ExpandableListViews. This is also used to provide a preview of
ListViews in the palette.
Note that the list preview is always showing the default list view
items. A later changeset will add the ability to pick a custom layout
to be used for listview rendering.
This changeset also contains a refactoring which pulls the cyclic
dependency validator out into a standalone class; this validator will
be used not just for include drop support but also for the layout
selector when picking layouts to preview in a listview.
Finally, the CalendarView has a new IViewRule which sets its default
width and height to fill parent.
Change-Id: If4fdec8d5439af69a34b029cb36a940fac953f86
Tor Norbye [Mon, 11 Apr 2011 23:47:31 +0000 (16:47 -0700)]
Merge "Usability fix for the layout actions bar"
Tor Norbye [Mon, 11 Apr 2011 23:47:21 +0000 (16:47 -0700)]
Merge "Add Table layout actions"
Tor Norbye [Mon, 11 Apr 2011 23:47:00 +0000 (16:47 -0700)]
Merge "Make theme selection take rendering target into account"
Raphael Moll [Mon, 11 Apr 2011 19:56:58 +0000 (12:56 -0700)]
Merge "SDK Manager: Fix detection of emulator in tools local folder."
Raphael Moll [Mon, 11 Apr 2011 19:31:01 +0000 (12:31 -0700)]
SDK Manager: Fix detection of emulator in tools local folder.
That's because the constant used did not have
the extension anymore.
Note: this was only an issue on Windows since mac/linux
don't need the .exe extension in emulator.
Also this doesn't fix the missing "emulator.exe" in AOSP,
but digit has the CL for that. So in AOSP one need to manually
copy tools/emulator-arm to tools/emulator for the local tools
package to be correctly recognized.
Change-Id: I9ab254eec5c28c4d006ba4132d6b0c6d87c01e15