OSDN Git Service
Raphael Moll [Mon, 7 Mar 2011 16:59:20 +0000 (08:59 -0800)]
Merge "DISABLED 2 lines that break the SDK build (bios.bin in sdk/tools.atree)"
Raphael Moll [Mon, 7 Mar 2011 16:47:42 +0000 (08:47 -0800)]
DISABLED 2 lines that break the SDK build (bios.bin in sdk/tools.atree)
Change-Id: I7d589782bf898d1ce09d0e29108566f7560019f1
Raphael Moll [Fri, 4 Mar 2011 21:48:29 +0000 (13:48 -0800)]
Merge "Don't erase SDCard when editing existing AVD."
Raphael Moll [Mon, 28 Feb 2011 22:11:44 +0000 (14:11 -0800)]
Don't erase SDCard when editing existing AVD.
SDK Bug 14162
Change-Id: I22493443e706bda830916ed0fc09741a1d6d1f15
Tor Norbye [Fri, 4 Mar 2011 21:30:43 +0000 (13:30 -0800)]
Merge "Add logging to help track down issue #15003 in the wild"
Tor Norbye [Fri, 4 Mar 2011 21:20:04 +0000 (13:20 -0800)]
Add logging to help track down issue #15003 in the wild
Change-Id: I3b7fb370e7e4b018d02b3986d81b14e89086c191
Raphael Moll [Fri, 4 Mar 2011 20:55:56 +0000 (12:55 -0800)]
Merge "Fix NPE in SdkManager: parsed props can be null."
David Turner [Fri, 4 Mar 2011 19:38:40 +0000 (11:38 -0800)]
Merge "Add qemu emulator bios files"
Raphael Moll [Fri, 4 Mar 2011 19:34:14 +0000 (11:34 -0800)]
Fix NPE in SdkManager: parsed props can be null.
Change-Id: Ia1b873fc48e87173148572b123d3c0346542f4d9
David 'Digit' Turner [Fri, 4 Mar 2011 19:21:41 +0000 (11:21 -0800)]
Merge "Fix Windows SDK build."
David 'Digit' Turner [Fri, 4 Mar 2011 19:20:08 +0000 (20:20 +0100)]
Fix Windows SDK build.
Change-Id: If9f7d3fc61b5969d84a2cda68dc1ad948c21ae88
David Turner [Fri, 4 Mar 2011 16:30:43 +0000 (08:30 -0800)]
Merge "x86 and arm emulators have distinct paths"
Tor Norbye [Fri, 4 Mar 2011 00:30:16 +0000 (16:30 -0800)]
Merge "Make XML code completion case insensitive"
Tor Norbye [Fri, 4 Mar 2011 00:30:10 +0000 (16:30 -0800)]
Merge "Add palette variations of widgets"
Tor Norbye [Fri, 4 Mar 2011 00:10:06 +0000 (16:10 -0800)]
Make XML code completion case insensitive
If you've typed "android:textsi" on a TextView, you currently get no
matches. This changeset makes the code completion case insensitive
(the way it is in Java) such that it for example will match
"android:textSize".
Change-Id: I0f698c2a4ee983d6c0fbcce272b851b2710c9a61
Bill Napier [Fri, 4 Mar 2011 00:01:16 +0000 (16:01 -0800)]
Merge "Remove trailing comma that was causing compile problems."
Bill Napier [Fri, 4 Mar 2011 00:00:22 +0000 (16:00 -0800)]
Remove trailing comma that was causing compile problems.
Change-Id: Ia80bd2c25b5898a6ad99b9404b89c1b41c8290ba
Bill Napier [Thu, 3 Mar 2011 23:00:04 +0000 (15:00 -0800)]
Merge "Allow loading MonkeyImages from a local filesystem."
Tor Norbye [Mon, 31 Jan 2011 04:52:05 +0000 (20:52 -0800)]
Add palette variations of widgets
This changeset adds new items to the palette which are just variations
of an existing widget but with different initial attributes. In
particular:
* Instead of just LinearLayout there are two versions of it:
LinearLayout (Vertical) and LinearLayout (Horizontal)
* The ProgressBar has 3 variations: Large, Small, and Horizontal. The
horizontal ProgressBar looks like the SeekBar, without at thumb, so
the SeekBar is moved next to the progress bar.
* There is a new palette category, "Text Fields", which contains a
number of different initializations of the EditText's "inputType"
attribute - for textual and numeric passwords, for names and e-mail
and postal addresses, for phone numbers, for negative and decimal
numbers, etc.
* Since LinearLayout is so common, the outline handles it specially to
ensure that we show a horizontal or a vertical icon depending on the
orientation attribute of the specific element rather than the
generic descriptor icon.
There are various changes to the palette icon preview and drag preview
etc to handle these changes. In particular, the category
initialization code had to be rewritten to be able to handle
variations (since for example the text field appears in multiple
categories, so the old assumption that each view had an assigned
category was no longer true.)
This changeset also extracts a constant for the "android:" literal
used in many places in the code, and renames the existing "android"
namespace constant.
Change-Id: Ibbc3dbd34c551594421c3de034cdccea6a66eba0
Tor Norbye [Thu, 3 Mar 2011 02:51:05 +0000 (18:51 -0800)]
Merge "More refactoring work: Convert hierarchy, and change type"
Tor Norbye [Wed, 2 Mar 2011 19:23:00 +0000 (11:23 -0800)]
Merge "Add drop-down menu button to the palette control"
Tor Norbye [Tue, 1 Mar 2011 21:13:27 +0000 (13:13 -0800)]
Add drop-down menu button to the palette control
Add a menu button to the palette label line, as is done in most
Eclipse windows, which brings up the context menu for the
palette. This makes the palette modes etc a bit more discoverable.
(I played with adding a few dedicated toggle buttons there as well,
but it looked a bit odd because the palette toolbar is a few pixels
higher than the layout actions bar in the canvas, so visually things
looked misaligned; we'll need to address that before adding proper
action buttons in the palette title panel.)
Change-Id: I18906ee7c2ebede96f167925ee27a7064715fa8b
Tor Norbye [Tue, 1 Mar 2011 20:47:24 +0000 (12:47 -0800)]
Merge "Fix Palette preview image scaling on Windows"
Xavier Ducrohet [Tue, 1 Mar 2011 19:37:17 +0000 (11:37 -0800)]
Merge "AVD and ADT eclipse plugin to support processor-specific platform images and emulators."
Johnnie Birch [Fri, 4 Feb 2011 02:56:59 +0000 (18:56 -0800)]
AVD and ADT eclipse plugin to support processor-specific platform images and emulators.
This is a first (and largest) patch in a series of patches over the next month to extend the
AVD and ADT eclipse plugin to support processor-specific platform images and emulators. This
patch is intended to co-exist with patches to create x86 emulator environments and overall
SDK support.
There is an overall expectation that the sdk building process will be updated to meet the
following expectations... It is not in the scope of these UI patches to change the overall
sdk building structure.
expectation #1:
tools/emulator[.exe] -- ARM
tools/emulator-x86[.exe] -- x86
tools/emulator-foo[.exe] -- an arbitrary additional architecture (extensible)
expectation #2:
platforms/android-XXX/images/arm - location of kernel/images for ARM
platforms/android-XXX/images/x86 - location of kernel/images for x86
platforms/android-XXX/images/foo - location of kernel/images for arbitrary architecture
expectation #3
In the event that add-ons are in the SDK,
add-ons/addon_XXX/images/arm - location of kernel/images for ARM
add-ons/addon_XXX/images/x86 - location of kernel/images for x86
add-ons/addon_XXX/images/foo - location of kernel/images for arbitrary architecture
NOTE: For "earlier"/legacy api levels, it is assumed that it is ARM only and the images will
be in platforms/android-XXX/images and add-ons/addon_XXX/images
When an API level is chosen in AVD, it scans the appropriate API directories and determines
if the image directory is "legacy" or if it has subdirectories. In the latter case, it
populates the list of potential processors using these directory names (and some
prettyprinting for well known architectures)
tested using "android" command line to start AVD on linux and windows
tested using Eclipse plugin AVD integration on linux and windows
REMINDER: You need to change the directory layout of images and add the right
emulator-XXX[.exe] to test it
If one uses the "android" command line to create an AVD from the command line, the
processor type is assumed to be arm today. A future patch will be needed to add
command line processor type selectivity
Change-Id: Ifd7c39bf93c6e926f62407bfed024d2789efb41a
Tor Norbye [Tue, 1 Mar 2011 02:50:51 +0000 (18:50 -0800)]
Fix Palette preview image scaling on Windows
When using palette previews with a scaling factor (e.g. the small or
tiny palette modes), the preview images look bad on Windows. This
appears to be because SWT on Windows has a different set of defaults
for antialiasing and interpolation.
This checkin turns on antialiased high interpolation for image
painting in the palette (when the palette is scaled) to address the
first issue listed in 15071: Layout editor rendering issues in ADT 10
Change-Id: Ie3c619d9105d9d30b1bbe5fb91c195c0f65fee97
Tor Norbye [Fri, 18 Feb 2011 00:53:34 +0000 (16:53 -0800)]
More refactoring work: Convert hierarchy, and change type
A lot of work on the "Change Layout" refactoring to improve conversion
to a Relative Layout. First, add a "Flatten Hierarchy" option which
can take an entire hierarchy of layout widgets and flatten it down to
a single top level RelativeLayout where the constraints attempt to
reflect the original layout. (This isn't always possible, since some
layout managers offer features not possible to express in
RelativeLayout, such as a LinearLayout with multiple different
weights) but it often works or is at least a good start. (This work
is ongoing, but since my changeset is getting large I want to check in
this snapshot since the functionality is better than what is in the
trunk.)
This changeset also adds a new refactoring: Change Widget Type. This
can be applied to a selection of elements, and it will convert the
widget type to the new target widget type. It will also remove any
attributes that are not valid for the new layout.
It also improves the wizards which display the possible target types.
For Change Widget Type, it will first offer "related" widgets, so for
an AnalogClock it will first offer Digital Clock, for a checkbox it
will offer a checked text view and a radio button, etc.
In addition, it will list Views and Layouts that it finds in any
library jars (except for the builtin Android ones), and any custom
view classes in the project.
There is also now some preliminary support for refactoring unit
tests. These tests must be run as Eclipse plugin tests, since they
utilize the XML model (and the XML model cannot be mocked). The test
infrastructure reads source XML files, applies the refactoring change
list to them, and diffs the output with the known expected output
(also stored as result XML files in the test project).
Finally, there are a number of fixes and improvements to the shared
refactoring code.
Change-Id: I0974653e530dfb4feb625e0eef8257c29d50614b
Bill Napier [Wed, 16 Feb 2011 21:55:36 +0000 (13:55 -0800)]
Allow loading MonkeyImages from a local filesystem.
Change-Id: I995ac65f1e376b01312d66f82441043971acd16c
Xavier Ducrohet [Mon, 28 Feb 2011 18:54:12 +0000 (10:54 -0800)]
Merge "Move FolderTypeRelationship to common.jar"
Xavier Ducrohet [Mon, 28 Feb 2011 18:53:16 +0000 (10:53 -0800)]
Merge "Change the FolderTypeRelationship and ResourceFile API to return list."
Xavier Ducrohet [Mon, 28 Feb 2011 18:53:09 +0000 (10:53 -0800)]
Merge "Move ResourceFolderType into common."
Xavier Ducrohet [Mon, 28 Feb 2011 18:53:04 +0000 (10:53 -0800)]
Merge "Rename AndroidConstants -> AdtConstants."
Xavier Ducrohet [Fri, 25 Feb 2011 22:57:16 +0000 (14:57 -0800)]
Merge "Move the sdk io classes to common.jar"
Xavier Ducrohet [Fri, 25 Feb 2011 18:34:06 +0000 (10:34 -0800)]
Move FolderTypeRelationship to common.jar
Change-Id: I3a151d2fadd1c1e34177cb729fe5545fa754849a
David Turner [Fri, 25 Feb 2011 16:23:05 +0000 (08:23 -0800)]
Merge "Emugen : A tool to generate wire protocol code"
Jacky Romano [Thu, 10 Feb 2011 09:04:25 +0000 (11:04 +0200)]
Emugen : A tool to generate wire protocol code
Emugen is a tool that can be used to generate code that
deals with marshaling/unmarshaling request to/from a wire-protocol.
Its input is an API defintion files and its output is C++ source
code for the client (caller) and the server (callee) sides.
See README file for more details.
Change-Id: I45beea6657fae0887d2b4d92933213ecc20d2525
Xavier Ducrohet [Fri, 25 Feb 2011 05:00:43 +0000 (21:00 -0800)]
Change the FolderTypeRelationship and ResourceFile API to return list.
This is better as we can return unmodifiable list instead of
arrays that could be overriden.
Change-Id: Id473925ee6355b2bedeb2d2575bc4ca4f949acb3
Xavier Ducrohet [Fri, 25 Feb 2011 04:27:07 +0000 (20:27 -0800)]
Move ResourceFolderType into common.
Moved some constants from sdklib (which is not a dependency
of common but instead depends on common) into common.
Change-Id: I6fdfbad4e77813a9f2a2ca9ea0d740692d8bce5b
Xavier Ducrohet [Fri, 25 Feb 2011 04:13:52 +0000 (20:13 -0800)]
Rename AndroidConstants -> AdtConstants.
These are constants specific to ADT.
There'll be an AndroidConstants class in common.jar with
more generic android constant values.
Change-Id: I8368920f92c28cbfb87098087bf01f2d2cdee095
Xavier Ducrohet [Fri, 25 Feb 2011 03:41:49 +0000 (19:41 -0800)]
Move the sdk io classes to common.jar
Change-Id: I59a7b770071707ed058aa104bab8a16aa8950d56
Xavier Ducrohet [Fri, 25 Feb 2011 02:09:42 +0000 (18:09 -0800)]
Merge "Move ninepatch tests from layoutlib to sdk where ninepatch lives."
Xavier Ducrohet [Thu, 24 Feb 2011 21:43:41 +0000 (13:43 -0800)]
Move ninepatch tests from layoutlib to sdk where ninepatch lives.
Change-Id: I6d23c6495622214f94502a73ebf80def0fb55e1a
Xavier Ducrohet [Thu, 24 Feb 2011 20:48:51 +0000 (12:48 -0800)]
Merge "Make the sdklib/sdkuilib tests built by the build system."
Raphael Moll [Thu, 24 Feb 2011 20:48:31 +0000 (12:48 -0800)]
Merge "Add min-platform-tools-rev to the tools source.properties"
Xavier Ducrohet [Thu, 24 Feb 2011 20:24:10 +0000 (12:24 -0800)]
Make the sdklib/sdkuilib tests built by the build system.
Change-Id: I9ec9175e0734a5b07fa5b3879cdf7b1ef0056d27
Xavier Ducrohet [Thu, 24 Feb 2011 18:47:33 +0000 (10:47 -0800)]
Merge "Remove some non needed asserts."
Bruce Beare [Wed, 9 Feb 2011 16:27:48 +0000 (08:27 -0800)]
Add qemu emulator bios files
Change-Id: I6f526b920f1d671e016ff8a2cde6f11843283e99
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Mon, 7 Feb 2011 20:33:05 +0000 (12:33 -0800)]
x86 and arm emulators have distinct paths
Change-Id: Ieb0aa637c44ff2b9d386b6927c0b8564d1b50621
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Raphael Moll [Thu, 24 Feb 2011 06:31:01 +0000 (22:31 -0800)]
Add min-platform-tools-rev to the tools source.properties
We need that info to generate the repository.xml since it's
a mandatory attribute in the XSD.
Change-Id: Ic341687f07f8d91182d680cd1d3b35e431c38670
Tor Norbye [Wed, 23 Feb 2011 23:01:31 +0000 (15:01 -0800)]
Merge "Tweak resource name validator, move code around"
Tor Norbye [Wed, 23 Feb 2011 20:45:56 +0000 (13:45 -0700)]
Tweak resource name validator, move code around
Incorporate some feedback from
https://review.source.android.com//#change,21341
Disallow uppercase chars in file-based resource names
Change-Id: I078b30be64e1aeb984f26d5c8b2976aa0083fcf4
Tor Norbye [Wed, 23 Feb 2011 19:56:35 +0000 (11:56 -0800)]
Merge "Fill FrameLayout children on drop depending on metadata"
Tor Norbye [Wed, 23 Feb 2011 19:55:43 +0000 (11:55 -0800)]
Merge "Disallow uppercase chars in file-based resource names"
Xavier Ducrohet [Tue, 22 Feb 2011 23:04:19 +0000 (15:04 -0800)]
Remove some non needed asserts.
Change-Id: Ib12b25d7c7a6630075cfe4f5e757a10673305220
Tor Norbye [Mon, 21 Feb 2011 23:18:38 +0000 (16:18 -0700)]
Fill FrameLayout children on drop depending on metadata
Adds a drop handler to the FrameLaoyut rule which looks up the
metadata for the dropped child, and sets the width and/or height to
fill based on that metadata. For example, a LinearLayout dropped into
a FrameLayout (or say a ViewFlipper which inherits from it), then the
layout will fill. A button on the other hand will not fill, and an
EditText will fill horizontally but not vertically, and so on.
Change-Id: I65a9379fa7128cc9c68d9bfd1849b0f1dc0f4a86
Tor Norbye [Mon, 21 Feb 2011 22:58:33 +0000 (15:58 -0700)]
Disallow uppercase chars in file-based resource names
Modifies the resource name validator (used from the New XML File
wizard) to consider the resource type. While value-based resources
(like ids) can contain uppercase characters, they are not allowed in
file-based resource names, like layouts, animations, etc.
Also hooks up the resource name validator to the Resource Chooser's
"New Resource" dialog.
Change-Id: Ic5b948d73e9a8b17c6fdaa11cc38189202b04dc2
Raphael Moll [Sat, 19 Feb 2011 18:02:49 +0000 (10:02 -0800)]
Merge "SDK Manager: fix extra package update detection."
Raphael Moll [Sat, 19 Feb 2011 01:02:29 +0000 (17:02 -0800)]
SDK Manager: fix extra package update detection.
Change-Id: Ie512a8cc75075987d1eb88dafd079e52083e2a3c
Xavier Ducrohet [Sat, 19 Feb 2011 00:55:15 +0000 (16:55 -0800)]
Merge "Properly parse mipmap names."
Xavier Ducrohet [Sat, 19 Feb 2011 00:29:26 +0000 (16:29 -0800)]
Properly parse mipmap names.
The extension was not removed making the references not found.
Change-Id: Ie420ea26df5bb87b86bd5b156597962b8c49252f
Raphael Moll [Fri, 18 Feb 2011 23:58:35 +0000 (15:58 -0800)]
Merge "SDK manager fix for "force create AVD""
Raphael Moll [Fri, 18 Feb 2011 23:24:34 +0000 (15:24 -0800)]
SDK manager fix for "force create AVD"
In the SDK Manager, creating an AVD would fail if there
was some file or folder in the way (in the .android/avd folder)
yet no AVD was loaded properly from it. This detects it,
properly notifies the user and makes "force create AVD"
work in this case.
Change-Id: Ie0abc383fef568c1a7e98c14eb7d48fbc5d66616
Raphael Moll [Fri, 18 Feb 2011 02:06:42 +0000 (18:06 -0800)]
Merge "Adjust AVD create dialog to match sdcard size limits."
Tor Norbye [Fri, 18 Feb 2011 01:11:45 +0000 (17:11 -0800)]
Merge "Add framework resources to the Resource Chooser"
Tor Norbye [Thu, 17 Feb 2011 01:27:12 +0000 (17:27 -0800)]
Add framework resources to the Resource Chooser
Reenable system resources in the Resource Chooser.
Adds code to AndroidTargetData which on demand loads data from public.xml
such that it can provide a list of public resource names.
Also uses this data to filter out non-public resources from code
completion.
Change-Id: I98611668473543aaec56ce3bc2e28e6606c867fd
Raphael Moll [Fri, 18 Feb 2011 00:17:06 +0000 (16:17 -0800)]
Adjust AVD create dialog to match sdcard size limits.
Change mksdcard to a minimum of 9 MiB, which is what
we enforce in the UI (I believe the 8 MiB min was obsoleted
by the 9 MiB one.)
Also warn the user about the min/max sdcard size properly
directly in the creation dialog, instead of relying on
mksdcard to fail later.
Change-Id: I30bc425ed6b75d8a00965e9e2e25890bd9bd8b39
Raphael Moll [Thu, 17 Feb 2011 22:12:14 +0000 (14:12 -0800)]
Merge "Mksdcard: Sanity check size, better error messages."
Raphael Moll [Thu, 17 Feb 2011 21:43:30 +0000 (13:43 -0800)]
Mksdcard: Sanity check size, better error messages.
Fixes:
- Issue 13277: mksdcard fails to create insanely large sdcard.
- Issue 14429: better error message when disk full.
Details:
- Actually report fopen/fwrite errors (instead of silently failing.)
This alone fixes the 2 reported issues.
- Check size argument parsed correctly and isn't larger than
the FAT format can handle.
- Actually indicate in the usage text the min/max size values.
- Added support for a 'G' postfix, to make gigabyte sdcards.
Change-Id: I4986c2c7c031f3b9bfd580b015b56d741aba778f
Tor Norbye [Thu, 17 Feb 2011 19:40:11 +0000 (11:40 -0800)]
Merge "Refactoring: Wrap in Container, Change Layout Type, Extract"
Tor Norbye [Mon, 14 Feb 2011 22:41:07 +0000 (14:41 -0800)]
Refactoring: Wrap in Container, Change Layout Type, Extract
This changeset adds refactoring support for 3 visual refactoring
operations:
(1) Wrap in Container. This can be invoked on one or more sibling
views (or the root view) to add a new layout container into the
hierarchy which "wraps" the views. The refactoring can also update
the layout attributes (such as RelativeLayout attachments) such
that they refer to the new container instead. If invoked on the
root element, the namespace declarations are migrated from the old
root to the new root.
(2) Change Layout. This can be invoked on a layout view to change the
type of layout. In addition to editing the XML type declaration,
it also removes layout parameters that no longer apply, and
depending on which layout you are converting from and converting
to, it may attempt to perform some translation to preserve the
layout characteristics. In particular, if you convert from a
LinearLayout to a RelativeLayout, then it will use RelativeLayout
params to emulate the old LinearLayout by attaching items below
(for vertical layouts) or to the right of (for horizontal layout)
the previous sibling, and if the baseline property was set on the
LinearLayout it will also add baseline constraints on the
RelativeLayout. (It also adds default ids on any elements that
need it.)
There is a LOT more we can do to support layout transformations;
this is just a beginning.
(3) Extract as Include. We already had this feature, but it performed
its own XML document manipulation. This code has been rewritten
to use the Eclipse refactoring support (which the other two
refactorings are implemented to use as well), which among other
things means that you get Preview support - you can press Preview
from the refactoring dialog to see the edits before they are
made. This rewrite is also necessary to support an upcoming
feature: the ability to replace occurrences in other
configuration-variations of this layout; for that we need to
ability to do multi-file changes which the refactoring support is
ideal for.
Change-Id: I50b142645f14c29c798fc02df6df69bad5b9426c
The Android Open Source Project [Thu, 17 Feb 2011 19:36:00 +0000 (11:36 -0800)]
merge from tools_r10
Change-Id: Id65c4186e62f7516343eaa27b4bbfdcce101e624
Xavier Ducrohet [Thu, 17 Feb 2011 19:11:51 +0000 (11:11 -0800)]
Merge "Add to layoutlib_api the ability to do layout only."
Raphaël Moll [Thu, 17 Feb 2011 18:16:10 +0000 (10:16 -0800)]
Merge "Adding import R class statement when creating project with different package Activity."
Xavier Ducrohet [Thu, 17 Feb 2011 17:59:08 +0000 (09:59 -0800)]
Add to layoutlib_api the ability to do layout only.
This lets the session do the measure/layout part and skip
the draw.
This returns the object location through the ViewInfo but
not the rendering.
Change-Id: I8875b4631b5fb00efa7096d804129612d46d9dc9
Xavier Ducrohet [Thu, 17 Feb 2011 02:54:36 +0000 (18:54 -0800)]
Merge "Merge
2c8b999e into tools_r10. do not merge." into tools_r10
Bertil Lynner [Fri, 14 Jan 2011 13:56:21 +0000 (14:56 +0100)]
Merge
2c8b999e into tools_r10. do not merge.
Update the sensor emulation to use the new HAL
The sensor HAL in libhardware was recently updated, this
change updates the sensor emulation to match the new HAL.
Change-Id: I1632d53dc2246934516104c6ebdb5b63576dfdd8
Xavier Ducrohet [Thu, 17 Feb 2011 01:47:22 +0000 (17:47 -0800)]
Merge "Merge
11e72f25 into tools_r10. DO NOT MERGE." into tools_r10
Mike Lockwood [Tue, 15 Feb 2011 04:54:04 +0000 (23:54 -0500)]
Merge
11e72f25 into tools_r10. DO NOT 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
Change-Id: I428534097852cfcc428aa93ba14c40558e35c8e8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Raphaël Moll [Wed, 16 Feb 2011 18:48:56 +0000 (10:48 -0800)]
Merge "Add datetime postfix to default file name when showing save screen image dialog."
Keiji Ariyama [Thu, 3 Feb 2011 17:59:43 +0000 (02:59 +0900)]
Adding import R class statement
when creating project with different package Activity.
Change-Id: Icce8609f9e925760b43778b39e064a74ba314900
Raphael Moll [Wed, 16 Feb 2011 17:57:56 +0000 (09:57 -0800)]
Merge "SDK Manager comment on adding new jar dependencies."
Xavier Ducrohet [Wed, 16 Feb 2011 01:10:30 +0000 (17:10 -0800)]
Merge "Fixing issue with updating AndroidManifest.xml when refactoring activity"
snpe [Wed, 16 Feb 2011 00:27:51 +0000 (01:27 +0100)]
Fixing issue with updating AndroidManifest.xml when refactoring activity
This change fixes http://code.google.com/p/android/issues/detail?id=14729
The problem happens when an activity is in subpackage of application
package.
Change-Id: If7ce1a2bcdaf6a51280477ec44c19c1dbea1c20f
Xavier Ducrohet [Tue, 15 Feb 2011 23:25:02 +0000 (15:25 -0800)]
Merge "Fix issue setting Javadoc to classpath container"
snpe [Fri, 14 Jan 2011 20:58:54 +0000 (21:58 +0100)]
Fix issue setting Javadoc to classpath container
This change fixes http://code.google.com/p/android/issues/detail?id=14017
- Android classpath container doesn't allow changing Javadoc attachment.
Change-Id: I6cdc767a295adea166311b90475f038a3f755aae
Xavier Ducrohet [Tue, 15 Feb 2011 23:08:34 +0000 (15:08 -0800)]
Merge "Fixing Android Source attachements"
Xavier Ducrohet [Tue, 15 Feb 2011 23:02:05 +0000 (15:02 -0800)]
Merge "Fix in FileListingService."
Tor Norbye [Tue, 15 Feb 2011 21:59:30 +0000 (13:59 -0800)]
Merge "XML editing: add ="" for attributes and change icons"
Tor Norbye [Tue, 15 Feb 2011 21:43:08 +0000 (13:43 -0800)]
Merge "Add validation messages to the DDMS edit filter dialog."
Keiji Ariyama [Tue, 15 Feb 2011 09:59:35 +0000 (18:59 +0900)]
Add validation messages to the DDMS edit filter dialog.
Fixing issue 3584.
http://code.google.com/p/android/issues/detail?id=3584
Change-Id: I689c0036f36678c92c08d05a6690610f95233c66
Xavier Ducrohet [Tue, 15 Feb 2011 17:29:23 +0000 (09:29 -0800)]
Merge "Fix emulator GPS support"
Mike Lockwood [Tue, 15 Feb 2011 04:54:04 +0000 (23:54 -0500)]
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
Change-Id: Ie7b2bd4bea519702d4238ba375bf83b059095b9e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Raphael Moll [Sat, 12 Feb 2011 00:35:51 +0000 (16:35 -0800)]
SDK Manager comment on adding new jar dependencies.
Change-Id: I6cdaefdb25f4899109dbf7b82c2872bc0b1362e6
Tor Norbye [Tue, 15 Feb 2011 01:03:04 +0000 (17:03 -0800)]
Merge "Make project-wide locale and render target settings"
Tor Norbye [Tue, 8 Feb 2011 16:04:40 +0000 (08:04 -0800)]
Make project-wide locale and render target settings
This changeset makes the locale and render target settings
project-wide, meaning that whenever you change the locale, or the
render target, the given locale or render target will be shown in all
layouts from the same project that you switch to.
The Locale and Render Target combo boxes are moved in to the top line
of the configuration chooser, and the dock mode and daytime mode
toggles are moved to the second line, such that the project-wide
settings are on the first line and the layout-specific settings are on
the second line.
Now, whenever you switch to a new language and open a different
layout, the language of the new layout will be forced to the current
locale. The only exception to this is for locale-specific layouts. If
you create a specific layout for a given locale, then that layout will
always be shown using its own locale, regardless of the project-wide
setting.
Change-Id: Idbe7e465a74afccfc0c68005a8784eafb2e8878d
Tor Norbye [Tue, 15 Feb 2011 00:41:13 +0000 (16:41 -0800)]
Merge "Add Show Included In safeguard, and work around Eclipse DOM bug"
Xavier Ducrohet [Tue, 15 Feb 2011 00:35:50 +0000 (16:35 -0800)]
Merge "All resource changes should trigger a layout rendering."
Xavier Ducrohet [Tue, 15 Feb 2011 00:11:58 +0000 (16:11 -0800)]
All resource changes should trigger a layout rendering.
The current code didn't render if a layout changed
but <include> support was added (way back!) and this could
trigger the need for a recompile.
Change-Id: Icf34f0c03ad0b4108103e3dc12916fba988ea0b3
Tor Norbye [Tue, 15 Feb 2011 00:12:49 +0000 (16:12 -0800)]
XML editing: add ="" for attributes and change icons
This changeset makes a couple of changes for editing XML files:
First, it changes the code completion proposals for attributes such
that when the attribute is inserted, it is inserted along with ="",
and the caret is placed inside the double quotes.
Second, it changes the icons for attributes and elements to use the
plain Eclipse attribute and element icons rather than
first-letter-derived icons. This is similar to how Eclipse does icons
for other file types, like Java (where all methods just use a green
ball for example, rather than different icons depending on the method
name.)
(An exception to this are the view elements, where we have dedicated
icons for most of the view types. For these, the individual icons are
used.)
Change-Id: I3c6927ce772265c9c8cbd2260bdc74f5ca959f56
Tor Norbye [Mon, 14 Feb 2011 17:02:27 +0000 (09:02 -0800)]
Merge "Refactor WorkingSet function."