OSDN Git Service

android-x86/sdk.git
13 years agodo not package .scala files as resources
Matthias Granberry [Mon, 6 Jun 2011 19:10:38 +0000 (14:10 -0500)]
do not package .scala files as resources

Change-Id: I8b0ac703fd60517f8c7857e7f7ce316e08ab51be

13 years agoMerge "Improve error message when ADT is older than layoutlib."
Xavier Ducrohet [Sat, 4 Jun 2011 01:26:41 +0000 (18:26 -0700)]
Merge "Improve error message when ADT is older than layoutlib."

13 years agoImprove error message when ADT is older than layoutlib.
Xavier Ducrohet [Sat, 4 Jun 2011 00:56:25 +0000 (17:56 -0700)]
Improve error message when ADT is older than layoutlib.

Change-Id: I1d52201c58f9fb92a87fd42585b653bf37730032

13 years agoMerge "Trim trailing whitespace in code completion test golden files"
Tor Norbye [Fri, 3 Jun 2011 20:15:16 +0000 (13:15 -0700)]
Merge "Trim trailing whitespace in code completion test golden files"

13 years agoMerge "Update unit test golden files to reflect recent changes"
Tor Norbye [Fri, 3 Jun 2011 20:14:57 +0000 (13:14 -0700)]
Merge "Update unit test golden files to reflect recent changes"

13 years agoMerge "Add support for the TV dpi."
Xavier Ducrohet [Fri, 3 Jun 2011 19:56:45 +0000 (12:56 -0700)]
Merge "Add support for the TV dpi."

13 years agoTrim trailing whitespace in code completion test golden files
Tor Norbye [Fri, 3 Jun 2011 19:32:20 +0000 (12:32 -0700)]
Trim trailing whitespace in code completion test golden files

There are no semantic changes.

Change-Id: I43eddc9372c6e5194ba645bbe2d2bedfc438c25b

13 years agoUpdate unit test golden files to reflect recent changes
Tor Norbye [Fri, 3 Jun 2011 19:25:41 +0000 (12:25 -0700)]
Update unit test golden files to reflect recent changes

Change-Id: I6c1eb0a0ab864f11cbc8cb9daddbf70189d03d11

13 years agoMerge "Refactor a method to extract an emulator port."
Brett Chabot [Fri, 3 Jun 2011 19:11:18 +0000 (12:11 -0700)]
Merge "Refactor a method to extract an emulator port."

13 years agoAdd support for the TV dpi.
Xavier Ducrohet [Fri, 3 Jun 2011 18:59:04 +0000 (11:59 -0700)]
Add support for the TV dpi.

Change-Id: I97fedc69644d83801b50d7882bb759db7089d8f0

13 years agoMerge "Fix bug in project-wide render target selection"
Tor Norbye [Thu, 2 Jun 2011 21:37:51 +0000 (14:37 -0700)]
Merge "Fix bug in project-wide render target selection"

13 years agoRefactor a method to extract an emulator port.
Brett Chabot [Thu, 2 Jun 2011 21:19:19 +0000 (14:19 -0700)]
Refactor a method to extract an emulator port.

Change-Id: I0dbab2c8f44a2114364075a91f31aa0d8d18d3ba

13 years agoFix bug in project-wide render target selection
Tor Norbye [Thu, 2 Jun 2011 20:55:09 +0000 (13:55 -0700)]
Fix bug in project-wide render target selection

I ran into a scenario where selecting a render target caused the new
target to be loaded, but then the selection jumped back to the
previous value. The reason for this is that there is a codepath from
the dropdown callback which ends up calling "syncRenderState" before
the old value has been saved, so syncRenderState will read the
previous value and sync it back to the dropdown. The fix is easy --
make sure we save the render state before notifying clients of the
change.

Change-Id: I28d8d8ec1e9c23311892ca05ab4348ae5aed90ae

13 years agoMerge "Extract client rules engine into top level class"
Tor Norbye [Thu, 2 Jun 2011 18:41:54 +0000 (11:41 -0700)]
Merge "Extract client rules engine into top level class"

13 years agoMerge "Fix invalid caching of project callback"
Tor Norbye [Thu, 2 Jun 2011 18:41:42 +0000 (11:41 -0700)]
Merge "Fix invalid caching of project callback"

13 years agoFix invalid caching of project callback
Tor Norbye [Thu, 2 Jun 2011 18:33:51 +0000 (11:33 -0700)]
Fix invalid caching of project callback

Change-Id: If7c0ee87e5263767e607cf226838e65667a5106c

13 years agoMerge "Fix: Filename isn't displayed on titlebar when the file not exist."
Tor Norbye [Thu, 2 Jun 2011 18:14:05 +0000 (11:14 -0700)]
Merge "Fix: Filename isn't displayed on titlebar when the file not exist."

13 years agoExtract client rules engine into top level class
Tor Norbye [Thu, 2 Jun 2011 15:17:42 +0000 (08:17 -0700)]
Extract client rules engine into top level class

The IDE-side implementation of the IClientRulesEngine interface was
nested within the RulesManager class, and has grown a lot over
time. This changeset moves it out as its own top level class. There
are no semantic changes, just a straightforward refactoring operation.

Change-Id: Ica072e8f7a06b822c6bde28e37b10ec86e05a402

13 years agoMerge "Simple code cleanup"
Tor Norbye [Thu, 2 Jun 2011 17:47:16 +0000 (10:47 -0700)]
Merge "Simple code cleanup"

13 years agoMerge "Properly configure KXml parsers."
Xavier Ducrohet [Thu, 2 Jun 2011 17:41:20 +0000 (10:41 -0700)]
Merge "Properly configure KXml parsers."

13 years agoSimple code cleanup
Tor Norbye [Thu, 2 Jun 2011 15:05:44 +0000 (08:05 -0700)]
Simple code cleanup

We had a number of constants for attribute values which had the prefix
VALUE_ but which were really attributes and should have the prefix
ATTR_.  We already had the equivalent ATTR_ constants, so get rid of
the VALUE_ constants and clean up the usage slightly.

Change-Id: Icc0f0ad8910695b4ac4904c620f73d6cf4bcacba

13 years agoMerge "Typo."
Tor Norbye [Thu, 2 Jun 2011 14:54:49 +0000 (07:54 -0700)]
Merge "Typo."

13 years agoTypo.
Kenji Tan [Thu, 2 Jun 2011 05:57:08 +0000 (22:57 -0700)]
Typo.

Fixed a typo. "Diplay" should read "Display".

Change-Id: I8b20e1c76e686e9ab5fa8ba9f8cee9a2ad1cd2a7

13 years agoProperly configure KXml parsers.
Xavier Ducrohet [Thu, 2 Jun 2011 01:30:53 +0000 (18:30 -0700)]
Properly configure KXml parsers.

Change-Id: If307659aabe37c5204f7e40c10fc93576de0e145

13 years agoMerge "Move rendering code into RenderService class"
Tor Norbye [Thu, 2 Jun 2011 01:22:24 +0000 (18:22 -0700)]
Merge "Move rendering code into RenderService class"

13 years agoMerge "Resize & Guideline Support"
Tor Norbye [Thu, 2 Jun 2011 01:21:39 +0000 (18:21 -0700)]
Merge "Resize & Guideline Support"

13 years agoMerge "Add Resize Support to the Layout Editor"
Tor Norbye [Thu, 2 Jun 2011 01:19:58 +0000 (18:19 -0700)]
Merge "Add Resize Support to the Layout Editor"

13 years agoMove rendering code into RenderService class
Tor Norbye [Wed, 1 Jun 2011 18:38:27 +0000 (11:38 -0700)]
Move rendering code into RenderService class

This CL moves the various rendering-related code in
GraphicalEditorPart into a separate RenderService class, which can be
configured for different purposes:

- Rendering a layout shown in the canvas
- Rendering palette previews
- Rendering a preview of a node during a drag from a palette
- Rendering a theme drawable
- Rendering layout-only to measure preferred sizes

Once configured, the rendering service can be used repeatedly and off
the UI thread to for example render all the palette previews without
blocking editor startup. This will be addressed in a follow-up CL.

Change-Id: I851148d80c3a4dc9e4b5b66c9838ae49809ea03c

13 years agoResize & Guideline Support
Tor Norbye [Sun, 10 Apr 2011 15:18:45 +0000 (08:18 -0700)]
Resize & Guideline Support

RelativeLayout now has both drop/move and resize guidelines, and
existing constraints are visualized for the selection.

LinearLayout resizing now uses weights to change the size of nodes
rather than setting width/height.

All resize operations offer guidelines to snap to their "wrap_content"
size.

Various bug fixes in related areas as well.

Change-Id: I817e34c6e67ce61cfb137eb067076d91f69f99e9

13 years agoAdd Resize Support to the Layout Editor
Tor Norbye [Thu, 7 Apr 2011 03:36:57 +0000 (20:36 -0700)]
Add Resize Support to the Layout Editor

This changeset adds "resizing" support to the layout editor.

First, the normal selection overlay is replaced with a selection
rectangle which also has "selection handles" in the corners and in the
middle of each edge. Moving the cursor over one of the selection
handle will show a directional resize cursor, and dragging the handle
will initiate a new resizing gesture. (This also made it possible to
remove the selection fill we've used until now, so the layout editor
will "interfere" less with the visual look of the layout.)

During the resizing operation, the current size is displayed in the
Eclipse status bar.

The resizability of widgets is determined by metadata, so for example
a ZoomControls widget is not resizable, a rating bar is only
horizontally resizable, a TableRow is only vertically resizable, and
most widgets are resizable in any direction.

The parent layout is involved in the resizing operation. Currently,
the resizing gestures will only update the width and height properties
(except for absolute layout, which will also set the x and y
properties if you are dragging a left or top edge). In a follow up
changeset this will be extended to for example make RelativeLayout
allow resize dragging to snap to new edges and the resize will be
applied as a set of new constraints on the "resized" widget. Thus,
you'll be able to drag the right hand side of a widget and drag it
over to attach to some other widget or edge, independent of what the
left edge or vertical edges are bound to.

This changeset also adds the ability for ViewRules to provide a
message or error message back to the IDE during a drag or resize
operation. For resizing this is used to display the new size. However,
it is now also used to display more useful messages in a couple of
older scenarios:
* Attempting to drag anything into a ListView will display a message
  that AdapterViews much be configured via Java code
* Attempting to drag anything into or within an AbsoluteLayout will
  warn that AbsoluteLayouts are deprecated.

Note that resizing will currently set the size to specific pixel (dip)
sizes. In the next changeset I will add guidelines which (in addition
to those described for RelativeLayout above) will add guidelines for
significant sizes such as the parent size, the preferred
(wrap_content) size of the widget, and possibly other hardcoded sizes
in the same layout.

Change-Id: Ie4f3367e81b24259a106c649c944008f4a3d31ec

13 years agoMerge "SdkMan2: fix package deletion."
Raphael Moll [Tue, 31 May 2011 19:37:49 +0000 (12:37 -0700)]
Merge "SdkMan2: fix package deletion."

13 years agoMerge "SdkMan2: fix Android platform name display."
Raphael Moll [Tue, 31 May 2011 19:37:21 +0000 (12:37 -0700)]
Merge "SdkMan2: fix Android platform name display."

13 years agoSdkMan2: fix package deletion.
Raphael Moll [Sat, 28 May 2011 02:11:58 +0000 (19:11 -0700)]
SdkMan2: fix package deletion.

2 minor fixes:
- make it possible to delete a local package even if it has
  updates available.
- refresh the local sdk parser after installing/deleting
  packages to make sure we're not showing an obsolete state.

Change-Id: If3aa197cdd16f414133ce6af09696c2676cb02ac

13 years agoSdkMan2: fix Android platform name display.
Raphael Moll [Sat, 28 May 2011 02:01:59 +0000 (19:01 -0700)]
SdkMan2: fix Android platform name display.

Change-Id: Ifb280a90fba3a7ecd5eb41ef8b4dd152a480d12a

13 years agoMerge "SdkManager: Refactor name of UpdaterWindow."
Raphael Moll [Tue, 31 May 2011 19:35:11 +0000 (12:35 -0700)]
Merge "SdkManager: Refactor name of UpdaterWindow."

13 years agoSdkManager: Refactor name of UpdaterWindow.
Raphael Moll [Sat, 28 May 2011 01:03:33 +0000 (18:03 -0700)]
SdkManager: Refactor name of UpdaterWindow.

Since the sdkmanager now contains separate windows for
the "SDK Updater" versus the "AVD Manager", the various
UpdaterWindow classes are renamed to SdkUpdateWindow.

We already have now a standalone AvdManagerWindow that
matches this pattern.

This is a pure refactoring/renaming CL with no workflow
change whatsoever.

Change-Id: I18ecb6aa33b7e9bd2294a959b371b424d03b2060

13 years agoMerge "AvdManager1: remove unused code."
Raphael Moll [Sat, 28 May 2011 01:17:00 +0000 (18:17 -0700)]
Merge "AvdManager1: remove unused code."

13 years agoAvdManager1: remove unused code.
Raphael Moll [Sat, 28 May 2011 00:51:38 +0000 (17:51 -0700)]
AvdManager1: remove unused code.

Change-Id: Id2f2b65d25403d57d68cb2257bc19723790ad82b

13 years agoMerge "SdkMan2: don't use yellow background anymore."
Raphael Moll [Sat, 28 May 2011 00:40:52 +0000 (17:40 -0700)]
Merge "SdkMan2: don't use yellow background anymore."

13 years agoMerge "New standalone AVD Manager window."
Raphael Moll [Sat, 28 May 2011 00:37:56 +0000 (17:37 -0700)]
Merge "New standalone AVD Manager window."

13 years agoMerge "[EXTERNALIZATION] This commit externalizes the strings of the DDMS plugin."
Xavier Ducrohet [Fri, 27 May 2011 23:47:21 +0000 (16:47 -0700)]
Merge "[EXTERNALIZATION] This commit externalizes the strings of the DDMS plugin."

13 years agoSdkMan2: don't use yellow background anymore.
Raphael Moll [Fri, 27 May 2011 22:13:19 +0000 (15:13 -0700)]
SdkMan2: don't use yellow background anymore.

Change-Id: I9bcc54b58ab717d22d881bd36d38d7594a175214

13 years ago[EXTERNALIZATION] This commit externalizes the strings of the DDMS plugin.
Pablo Leite [Thu, 17 Feb 2011 15:20:36 +0000 (13:20 -0200)]
[EXTERNALIZATION] This commit externalizes the strings of the DDMS plugin.

After applying it, please run the Eclipse's Externalize Wizard at “Source -> Externalize Strings…”. This ensure that hard-coded strings added between the time the patch was created and the time it was integrated will also be externalized.

From the time this patch is integrated on, each new string created in the plugin
should be added to the following files:

eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/i18n/messages.properties
Example: JavaClassName_MessageID=<string value>
<string value> refers to the string itself.

eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/i18n/Messages.java
Example: public static String JavaClassName_MessageID;

In the Java class, the new string should be referenced this way:
Messages.JavaClassName_MessageID

Related patches: All patches with the [EXTERNALIZATION] tag

Changes after review:
Code formatted according using android code formatter template
Merged Strings DeviceView_Unable_Create_HPROF_For_Application and DeviceView_Unable_Create_HPROF_For_Application.
Removed Motorola copyright notices.

Change-Id: Id889db593ef313760515f28b5973d3a9a8ad80d0

13 years agoMerge "Fixed MonkeyRunner to work with PyDev."
Bill Napier [Thu, 26 May 2011 23:39:44 +0000 (16:39 -0700)]
Merge "Fixed MonkeyRunner to work with PyDev."

13 years agoMerge "Fixed MonkeyRunner startup script for manual build"
Bill Napier [Thu, 26 May 2011 23:39:14 +0000 (16:39 -0700)]
Merge "Fixed MonkeyRunner startup script for manual build"

13 years agoFixed MonkeyRunner startup script for manual build
Michael Wright [Wed, 25 May 2011 19:43:53 +0000 (12:43 -0700)]
Fixed MonkeyRunner startup script for manual build

Fixed the monkeyrunner startup script to include the proper SWT
directory when monkeyrunner is started after a manual build (i.e. not
from the prebuilt SDK)

Change-Id: Ide8fa6949bba6f2e024ac69f8dd235795dab2a6a

13 years agoFixed MonkeyRunner to work with PyDev.
Michael Wright [Wed, 25 May 2011 19:42:31 +0000 (12:42 -0700)]
Fixed MonkeyRunner to work with PyDev.

Eclipse passes the -u option to MonkeyRunner by default. Since we don't
do anything with that option, we can just ignore it.

Bug: 4109883

Change-Id: If3624c13583f639e745742f100a0e31e1ab694ad

13 years agoMerge "Repository XML for R12: layoutlib version for addons."
Raphael Moll [Thu, 26 May 2011 20:46:24 +0000 (13:46 -0700)]
Merge "Repository XML for R12: layoutlib version for addons."

13 years agoMerge "Default render target level should consider project target"
Tor Norbye [Thu, 26 May 2011 19:06:18 +0000 (12:06 -0700)]
Merge "Default render target level should consider project target"

13 years agoDefault render target level should consider project target
Tor Norbye [Wed, 25 May 2011 22:50:53 +0000 (15:50 -0700)]
Default render target level should consider project target

When picking the default render target, we attempt to pick a render
target that is at least version 5 of layoutlib (where rendering
fidelity has improved significantly, where include support is
improved, etc.)

However, this sometimes picked a render target whose API level is
lower than the project target.

This CL fixes that problem, and also improves the detection of
compatible layout libraries to not only consider API level 11 or
higher, but also the new layoutlib API property which will identify
qualified SDK versions when we release backported versions of layout
lib.

Change-Id: I4d4159389692d984a66856eeb80035a8e8b7d1cf

13 years agoRepository XML for R12: layoutlib version for addons.
Raphael Moll [Wed, 25 May 2011 23:43:57 +0000 (16:43 -0700)]
Repository XML for R12: layoutlib version for addons.

Change-Id: I5e68225ae8fb12a845e1eeec7412bf0bf7d9d676

13 years agoMerge "Fix ADT-test"
Xavier Ducrohet [Wed, 25 May 2011 23:16:47 +0000 (16:16 -0700)]
Merge "Fix ADT-test"

13 years agoFix ADT-test
Xavier Ducrohet [Wed, 25 May 2011 23:16:17 +0000 (16:16 -0700)]
Fix ADT-test

Change-Id: Iebc29d774747ba64f1f895cd36970330145fd6b4

13 years agoMerge "Add support for addon providing their own layoutlib and/or res."
Xavier Ducrohet [Wed, 25 May 2011 22:47:52 +0000 (15:47 -0700)]
Merge "Add support for addon providing their own layoutlib and/or res."

13 years agoAdd support for addon providing their own layoutlib and/or res.
Xavier Ducrohet [Thu, 21 Apr 2011 17:02:35 +0000 (10:02 -0700)]
Add support for addon providing their own layoutlib and/or res.

During addon parsing, the SDK Manager will detect whether the addon
has:
- data/layoutlib.jar
- data/res/
- data/fonts/

if the first one is present, then it is used during rendering.
if *both* the 2nd and 3rd ones are present, then addon resources
are used during rendering.

On the GLE side, all that's needed is adding addons to the list
of rendering targets if they have either library or resources (or
both).

Change-Id: Id16925eea2c98b9fbaaa884ac6fd8c1c1c444db2

13 years agoMerge "Fix flaky SdkRepository test."
Raphael Moll [Wed, 25 May 2011 18:20:16 +0000 (11:20 -0700)]
Merge "Fix flaky SdkRepository test."

13 years agoFix flaky SdkRepository test.
Raphael Moll [Wed, 25 May 2011 17:38:31 +0000 (10:38 -0700)]
Fix flaky SdkRepository test.

It seems like class.getResourceAsStream throws a
NullPointerException on the test machines whereas
it returns null (as documented) other times when
the resource is not found.

This patch refactors 2 duplicated getXsdStream
methods in the base RepoConstants and adjusts to
take both behaviors into account.

Change-Id: Ieefd92a006efda30828b8043e39f6b7e904bc53f

13 years agoMerge "Prevent 'make sdk_repo' from picking up future schemas."
Raphael Moll [Wed, 25 May 2011 05:48:26 +0000 (22:48 -0700)]
Merge "Prevent 'make sdk_repo' from picking up future schemas."

13 years agoPrevent 'make sdk_repo' from picking up future schemas.
Raphael Moll [Wed, 25 May 2011 05:43:37 +0000 (22:43 -0700)]
Prevent 'make sdk_repo' from picking up future schemas.

Change-Id: I749f4727b4c257ef5a6177b05727f5944d5d81ed

13 years agoMerge "New Repository XSD for R12."
Raphael Moll [Wed, 25 May 2011 02:02:14 +0000 (19:02 -0700)]
Merge "New Repository XSD for R12."

13 years agoMerge "Prevent NPE when server is not running."
Xavier Ducrohet [Wed, 25 May 2011 01:25:35 +0000 (18:25 -0700)]
Merge "Prevent NPE when server is not running."

13 years agoPrevent NPE when server is not running.
Romain Guy [Wed, 25 May 2011 00:38:06 +0000 (17:38 -0700)]
Prevent NPE when server is not running.

Change-Id: Iea1ba8fd78aca61611e73a29fe8b08b96783b248

13 years agoMerge "Use sdklib.OsHelper in AddCompatibilityJarAction."
Raphael Moll [Wed, 25 May 2011 00:20:18 +0000 (17:20 -0700)]
Merge "Use sdklib.OsHelper in AddCompatibilityJarAction."

13 years agoNew standalone AVD Manager window.
Raphael Moll [Wed, 18 May 2011 22:52:14 +0000 (15:52 -0700)]
New standalone AVD Manager window.

This is the the current "AVD Manager" page wrapped
as a window so that it can be used either in standalone
or from the new SDK Manager 2.

Change-Id: Id6272ca87481890809e483eee6d57e715d8ad517

13 years agoUse sdklib.OsHelper in AddCompatibilityJarAction.
Raphael Moll [Tue, 24 May 2011 23:28:15 +0000 (16:28 -0700)]
Use sdklib.OsHelper in AddCompatibilityJarAction.

ADT's AddCompatibilityJarAction defined 2 new generic
useful methods, copyFile and isSameFile. SdkLib already
had an OsHelper.copyFile, so I moved that class to a
more generic sdklib.io package and added the new method
isSameFile.

Another suitable candidate would have been io.FileWrapper
in the common project.

Change-Id: If310e09af112c5f4d87a253b35e67e4f5adb34da

13 years agoNew Repository XSD for R12.
Raphael Moll [Mon, 23 May 2011 20:17:14 +0000 (13:17 -0700)]
New Repository XSD for R12.

This add a new schema sdk-repository-4 with the following
changes:

- <extra> element now has a <project-files> element that
contains 1 or or more <path>, each indicating the relative
path of a file that this package can contribute to
installed projects.

- <platform> element now has a mandatory <layoutlib>
that indicates the API and revision of that layout library
for this particular platform.

There's also a matching sdk-addon-2 schema with the same
modification to the <extra> element.

Change-Id: Id74a5d09dfa36d65f11b9d60a82fe8ba4119eb34

13 years agomerge from tools-adt_r11
The Android Open-Source Project [Tue, 24 May 2011 19:28:08 +0000 (12:28 -0700)]
merge from tools-adt_r11

Change-Id: I45f882507745c3375e2fed88a9f401e4ddc1adda

13 years agoMerge "Don't apply default attributes in a move/copy. DO NOT MERGE" into tools-adt_r11
Tor Norbye [Tue, 24 May 2011 19:27:43 +0000 (12:27 -0700)]
Merge "Don't apply default attributes in a move/copy. DO NOT MERGE" into tools-adt_r11

13 years agoDon't apply default attributes in a move/copy. DO NOT MERGE
Tor Norbye [Tue, 24 May 2011 17:48:55 +0000 (10:48 -0700)]
Don't apply default attributes in a move/copy. DO NOT MERGE

There is a method in the layout editor which fills in required default
attributes like id, width and height, as well as some optional
attributes like a default text attribute.

This code was called unconditionally whenever a new child is added to
a layout. However, this should only be done when a new widget is
created, not during moves or copies from existing elements.

Change-Id: I2b437ef609a168f1bb1b7698d3a954a4d2f5faa0

13 years agoMerge "Disable palette preview for some widgets on some platforms. DO NOT MERGE"...
Tor Norbye [Tue, 24 May 2011 19:25:17 +0000 (12:25 -0700)]
Merge "Disable palette preview for some widgets on some platforms. DO NOT MERGE" into tools-adt_r11

13 years agoDisable palette preview for some widgets on some platforms. DO NOT MERGE
Tor Norbye [Tue, 24 May 2011 17:58:29 +0000 (10:58 -0700)]
Disable palette preview for some widgets on some platforms. DO NOT MERGE

ListView palette preview requires adapterview support in layoutlib,
and DatePicker and TimePicker require Holo themes on Honeycomb. This
changeset adds some conditional logic to the palette preview code to
drop rendering of these widgets based on the current render target,
layout library and theme.

Change-Id: I3ed30682485655ca7463baa8ea1133fddebe7091

13 years agoMerge "Don't apply default attributes in a move/copy"
Tor Norbye [Tue, 24 May 2011 18:39:03 +0000 (11:39 -0700)]
Merge "Don't apply default attributes in a move/copy"

13 years agoMerge "Disable palette preview for some widgets on some platforms"
Tor Norbye [Tue, 24 May 2011 18:38:53 +0000 (11:38 -0700)]
Merge "Disable palette preview for some widgets on some platforms"

13 years agoDisable palette preview for some widgets on some platforms
Tor Norbye [Tue, 24 May 2011 17:58:29 +0000 (10:58 -0700)]
Disable palette preview for some widgets on some platforms

ListView palette preview requires adapterview support in layoutlib,
and DatePicker and TimePicker require Holo themes on Honeycomb. This
changeset adds some conditional logic to the palette preview code to
drop rendering of these widgets based on the current render target,
layout library and theme.

Change-Id: Ic42a40faf817e60525485e0a46b7ad967ed1c363

13 years agoDon't apply default attributes in a move/copy
Tor Norbye [Tue, 24 May 2011 17:48:55 +0000 (10:48 -0700)]
Don't apply default attributes in a move/copy

There is a method in the layout editor which fills in required default
attributes like id, width and height, as well as some optional
attributes like a default text attribute.

This code was called unconditionally whenever a new child is added to
a layout. However, this should only be done when a new widget is
created, not during moves or copies from existing elements.

Change-Id: Ic04dec746c70359eca38454bacfdcdb87891719f

13 years agoMerge "Make instrumentation test failure message more verbose."
Brett Chabot [Tue, 24 May 2011 01:44:22 +0000 (18:44 -0700)]
Merge "Make instrumentation test failure message more verbose."

13 years agomerge from tools-adt_r11
The Android Open Source Project [Tue, 24 May 2011 01:03:12 +0000 (18:03 -0700)]
merge from tools-adt_r11

Change-Id: I74cedd09950ed16041cb5c6e18c8f367878cd390

13 years agoMerge "List project themes, if any, before framework themes. DO NOT MERGE" into tools...
Tor Norbye [Mon, 23 May 2011 22:43:31 +0000 (15:43 -0700)]
Merge "List project themes, if any, before framework themes. DO NOT MERGE" into tools-adt_r11

13 years agoMerge "Detect and add special warning for wrong themes. DO NOT MERGE" into tools...
Tor Norbye [Mon, 23 May 2011 22:43:09 +0000 (15:43 -0700)]
Merge "Detect and add special warning for wrong themes. DO NOT MERGE" into tools-adt_r11

13 years agoList project themes, if any, before framework themes. DO NOT MERGE
Tor Norbye [Sat, 21 May 2011 03:18:50 +0000 (20:18 -0700)]
List project themes, if any, before framework themes. DO NOT MERGE

This changeset moves the project-themes in the combobox up above the
framework themes, since
(a) it's likely that the user wants to frequently choose these, and
(b) the list of project themes is usually much smaller than the
    framework list, so it brings these items up to the visible part of
    the combo

Change-Id: I1cb29fffc289fc594c9e6cedc4461b4dd76808ea

13 years agoDetect and add special warning for wrong themes. DO NOT MERGE
Tor Norbye [Sat, 21 May 2011 03:41:35 +0000 (20:41 -0700)]
Detect and add special warning for wrong themes. DO NOT MERGE

If you open a layout designed for a particular theme in another theme,
you can get many confusing error messages. Instead of "attribute
missing" it may tell you that it failed to convert a resource to a
color or drawable, and so on.

To help guide users to the root problem (wrong theme chosen) this
changeset detects the scenario where theme attributes can't be
resolved, and when these are found the top of the error log will start
with a bold message stating that theme resources were not found and to
check whether the correct theme is chosen.

To do this, the resource resolver emits a new sub-type of the resource
missing tag into the error log, which is used in the IDE to prefix the
errors with the special error message.

Change-Id: Ifa188cd67412e4536bc10bda64716a62dfa9695d

13 years agoMerge "List project themes, if any, before framework themes"
Tor Norbye [Mon, 23 May 2011 22:39:31 +0000 (15:39 -0700)]
Merge "List project themes, if any, before framework themes"

13 years agoMerge "Detect and add special warning for wrong themes"
Tor Norbye [Mon, 23 May 2011 22:39:16 +0000 (15:39 -0700)]
Merge "Detect and add special warning for wrong themes"

13 years agoMerge "Allow HV to work on user builds."
Xavier Ducrohet [Mon, 23 May 2011 21:09:46 +0000 (14:09 -0700)]
Merge "Allow HV to work on user builds."

13 years agoDetect and add special warning for wrong themes
Tor Norbye [Sat, 21 May 2011 03:41:35 +0000 (20:41 -0700)]
Detect and add special warning for wrong themes

If you open a layout designed for a particular theme in another theme,
you can get many confusing error messages. Instead of "attribute
missing" it may tell you that it failed to convert a resource to a
color or drawable, and so on.

To help guide users to the root problem (wrong theme chosen) this
changeset detects the scenario where theme attributes can't be
resolved, and when these are found the top of the error log will start
with a bold message stating that theme resources were not found and to
check whether the correct theme is chosen.

To do this, the resource resolver emits a new sub-type of the resource
missing tag into the error log, which is used in the IDE to prefix the
errors with the special error message.

Change-Id: Ic29c9af37da4b5cc2c9fb1ca5670c8b8f79bf852

13 years agoMerge "NPE safeguard. DO NOT MERGE" into tools-adt_r11
Tor Norbye [Mon, 23 May 2011 19:27:32 +0000 (12:27 -0700)]
Merge "NPE safeguard. DO NOT MERGE" into tools-adt_r11

13 years agoNPE safeguard. DO NOT MERGE
Tor Norbye [Sat, 21 May 2011 03:28:56 +0000 (20:28 -0700)]
NPE safeguard. DO NOT MERGE

Change-Id: I4d7a3d449a120e1e1ab86f99254daf0e58165ab4

13 years agoMerge "NPE safeguard"
Tor Norbye [Mon, 23 May 2011 18:27:44 +0000 (11:27 -0700)]
Merge "NPE safeguard"

13 years agoNPE safeguard
Tor Norbye [Sat, 21 May 2011 03:28:56 +0000 (20:28 -0700)]
NPE safeguard

Change-Id: I3f55c21f79ad66bed1329a2f5882deb94e93be62

13 years agoList project themes, if any, before framework themes
Tor Norbye [Sat, 21 May 2011 03:18:50 +0000 (20:18 -0700)]
List project themes, if any, before framework themes

This changeset moves the project-themes in the combobox up above the
framework themes, since
(a) it's likely that the user wants to frequently choose these, and
(b) the list of project themes is usually much smaller than the
    framework list, so it brings these items up to the visible part of
    the combo

Change-Id: Idb989d388f5cb1f5cc6a302a6c5796db69e78c8e

13 years agoMerge "Merge AdtUpdateDialog CL on top of latest SdkMan2"
Raphael Moll [Sat, 21 May 2011 01:13:35 +0000 (18:13 -0700)]
Merge "Merge AdtUpdateDialog CL on top of latest SdkMan2"

13 years agoMerge "SdkMan2: Use IDE's log when available."
Raphael Moll [Sat, 21 May 2011 01:13:22 +0000 (18:13 -0700)]
Merge "SdkMan2: Use IDE's log when available."

13 years agoMerge "SdkMan2: don't display update packages as sub-items."
Raphael Moll [Sat, 21 May 2011 01:13:14 +0000 (18:13 -0700)]
Merge "SdkMan2: don't display update packages as sub-items."

13 years agoMerge "Mechanism to disable SwtMenuBar in SdkMan2"
Raphael Moll [Sat, 21 May 2011 01:13:05 +0000 (18:13 -0700)]
Merge "Mechanism to disable SwtMenuBar in SdkMan2"

13 years agoMerge "Cleanup IUpdaterWindow in SdkManager."
Raphael Moll [Sat, 21 May 2011 01:12:48 +0000 (18:12 -0700)]
Merge "Cleanup IUpdaterWindow in SdkManager."

13 years agoMerge "SDK Manager dialog to perform specific updates from ADT. DO NOT MERGE." into...
Raphael Moll [Sat, 21 May 2011 01:12:23 +0000 (18:12 -0700)]
Merge "SDK Manager dialog to perform specific updates from ADT. DO NOT MERGE." into tools-adt_r11

13 years agoMerge "Move Grid{Data,Layout}Builder to SDK UI Lib. DO NOT MERGE." into tools-adt_r11
Raphael Moll [Sat, 21 May 2011 01:12:00 +0000 (18:12 -0700)]
Merge "Move Grid{Data,Layout}Builder to SDK UI Lib. DO NOT MERGE." into tools-adt_r11

13 years agoMerge "Merge d4166974 from master. do not merge. Fix issue with resource repository...
Xavier Ducrohet [Fri, 20 May 2011 23:10:59 +0000 (16:10 -0700)]
Merge "Merge d4166974 from  do not merge. Fix issue with resource repository when using libraries" into tools-adt_r11

13 years agoMerge d4166974 from master. do not merge.
Xavier Ducrohet [Fri, 20 May 2011 22:44:49 +0000 (15:44 -0700)]
Merge d4166974 from master. do not merge.
Fix issue with resource repository when using libraries

Change-Id: I45c8af34020f047f08a53ddd6ada3a8be4061a52

13 years agoMerge "Fix issue with resource repository when using libraries"
Xavier Ducrohet [Fri, 20 May 2011 23:05:29 +0000 (16:05 -0700)]
Merge "Fix issue with resource repository when using libraries"