OSDN Git Service
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
Raphael Moll [Sat, 28 May 2011 02:01:59 +0000 (19:01 -0700)]
SdkMan2: fix Android platform name display.
Change-Id: Ifb280a90fba3a7ecd5eb41ef8b4dd152a480d12a
Raphael Moll [Tue, 31 May 2011 19:35:11 +0000 (12:35 -0700)]
Merge "SdkManager: 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
Raphael Moll [Sat, 28 May 2011 01:17:00 +0000 (18:17 -0700)]
Merge "AvdManager1: remove unused code."
Raphael Moll [Sat, 28 May 2011 00:51:38 +0000 (17:51 -0700)]
AvdManager1: remove unused code.
Change-Id: Id2f2b65d25403d57d68cb2257bc19723790ad82b
Raphael Moll [Sat, 28 May 2011 00:40:52 +0000 (17:40 -0700)]
Merge "SdkMan2: don't use yellow background anymore."
Raphael Moll [Sat, 28 May 2011 00:37:56 +0000 (17:37 -0700)]
Merge "New standalone AVD Manager window."
Xavier Ducrohet [Fri, 27 May 2011 23:47:21 +0000 (16:47 -0700)]
Merge "[EXTERNALIZATION] This commit externalizes the strings of the DDMS plugin."
Raphael Moll [Fri, 27 May 2011 22:13:19 +0000 (15:13 -0700)]
SdkMan2: don't use yellow background anymore.
Change-Id: I9bcc54b58ab717d22d881bd36d38d7594a175214
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
Bill Napier [Thu, 26 May 2011 23:39:44 +0000 (16:39 -0700)]
Merge "Fixed MonkeyRunner to work with PyDev."
Bill Napier [Thu, 26 May 2011 23:39:14 +0000 (16:39 -0700)]
Merge "Fixed 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
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
Raphael Moll [Thu, 26 May 2011 20:46:24 +0000 (13:46 -0700)]
Merge "Repository XML for R12: layoutlib version for addons."
Tor Norbye [Thu, 26 May 2011 19:06:18 +0000 (12:06 -0700)]
Merge "Default 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
Raphael Moll [Wed, 25 May 2011 23:43:57 +0000 (16:43 -0700)]
Repository XML for R12: layoutlib version for addons.
Change-Id: I5e68225ae8fb12a845e1eeec7412bf0bf7d9d676
Xavier Ducrohet [Wed, 25 May 2011 23:16:47 +0000 (16:16 -0700)]
Merge "Fix ADT-test"
Xavier Ducrohet [Wed, 25 May 2011 23:16:17 +0000 (16:16 -0700)]
Fix ADT-test
Change-Id: Iebc29d774747ba64f1f895cd36970330145fd6b4
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."
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
Raphael Moll [Wed, 25 May 2011 18:20:16 +0000 (11:20 -0700)]
Merge "Fix 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
Raphael Moll [Wed, 25 May 2011 05:48:26 +0000 (22:48 -0700)]
Merge "Prevent '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
Raphael Moll [Wed, 25 May 2011 02:02:14 +0000 (19:02 -0700)]
Merge "New Repository XSD for R12."
Xavier Ducrohet [Wed, 25 May 2011 01:25:35 +0000 (18:25 -0700)]
Merge "Prevent 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
Raphael Moll [Wed, 25 May 2011 00:20:18 +0000 (17:20 -0700)]
Merge "Use sdklib.OsHelper in AddCompatibilityJarAction."
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
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
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
The Android Open-Source Project [Tue, 24 May 2011 19:28:08 +0000 (12:28 -0700)]
merge from tools-adt_r11
Change-Id: I45f882507745c3375e2fed88a9f401e4ddc1adda
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
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
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
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
Tor Norbye [Tue, 24 May 2011 18:39:03 +0000 (11:39 -0700)]
Merge "Don't apply default attributes in a move/copy"
Tor Norbye [Tue, 24 May 2011 18:38:53 +0000 (11:38 -0700)]
Merge "Disable 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
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
Brett Chabot [Tue, 24 May 2011 01:44:22 +0000 (18:44 -0700)]
Merge "Make instrumentation test failure message more verbose."
The Android Open Source Project [Tue, 24 May 2011 01:03:12 +0000 (18:03 -0700)]
merge from tools-adt_r11
Change-Id: I74cedd09950ed16041cb5c6e18c8f367878cd390
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
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
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
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
Tor Norbye [Mon, 23 May 2011 22:39:31 +0000 (15:39 -0700)]
Merge "List project themes, if any, before framework themes"
Tor Norbye [Mon, 23 May 2011 22:39:16 +0000 (15:39 -0700)]
Merge "Detect and add special warning for wrong themes"
Xavier Ducrohet [Mon, 23 May 2011 21:09:46 +0000 (14:09 -0700)]
Merge "Allow HV to work on user builds."
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
Tor Norbye [Mon, 23 May 2011 19:27:32 +0000 (12:27 -0700)]
Merge "NPE safeguard. DO NOT MERGE" into tools-adt_r11
Tor Norbye [Sat, 21 May 2011 03:28:56 +0000 (20:28 -0700)]
NPE safeguard. DO NOT MERGE
Change-Id: I4d7a3d449a120e1e1ab86f99254daf0e58165ab4
Tor Norbye [Mon, 23 May 2011 18:27:44 +0000 (11:27 -0700)]
Merge "NPE safeguard"
Tor Norbye [Sat, 21 May 2011 03:28:56 +0000 (20:28 -0700)]
NPE safeguard
Change-Id: I3f55c21f79ad66bed1329a2f5882deb94e93be62
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
Raphael Moll [Sat, 21 May 2011 01:13:35 +0000 (18:13 -0700)]
Merge "Merge AdtUpdateDialog CL on top of latest SdkMan2"
Raphael Moll [Sat, 21 May 2011 01:13:22 +0000 (18:13 -0700)]
Merge "SdkMan2: Use IDE's log when available."
Raphael Moll [Sat, 21 May 2011 01:13:14 +0000 (18:13 -0700)]
Merge "SdkMan2: don't display update packages as sub-items."
Raphael Moll [Sat, 21 May 2011 01:13:05 +0000 (18:13 -0700)]
Merge "Mechanism to disable SwtMenuBar in SdkMan2"
Raphael Moll [Sat, 21 May 2011 01:12:48 +0000 (18:12 -0700)]
Merge "Cleanup IUpdaterWindow in SdkManager."
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
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
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
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
Xavier Ducrohet [Fri, 20 May 2011 23:05:29 +0000 (16:05 -0700)]
Merge "Fix issue with resource repository when using libraries"
Raphael Moll [Thu, 19 May 2011 04:16:38 +0000 (21:16 -0700)]
SDK Manager dialog to perform specific updates from ADT. DO NOT MERGE.
As a working case example, this adds an ADT project
context menu to add the Android Compatibility JAR
to an android project.
Change-Id: Icd86930b72558240dc9f5a6f732478253b8cb0fb
Raphael Moll [Fri, 13 May 2011 18:27:20 +0000 (11:27 -0700)]
Move Grid{Data,Layout}Builder to SDK UI Lib. DO NOT MERGE.
(cherry picked from commit
7f7cdef2e2c1741114588f4f8c774fabb9567dde)
Change-Id: I6301730b125aab3c22e0893e9adb46003a4a2315
Xavier Ducrohet [Fri, 20 May 2011 22:44:49 +0000 (15:44 -0700)]
Fix issue with resource repository when using libraries
Change-Id: I1a3e5ba9ac6e930d4be2daedff9691862f975408
Tor Norbye [Fri, 20 May 2011 22:12:20 +0000 (15:12 -0700)]
Merge "Offer to install fragment compatibility library"
Tor Norbye [Fri, 20 May 2011 22:01:33 +0000 (15:01 -0700)]
Offer to install fragment compatibility library
This changeset changes the popup displayed when you drop a fragment
tag in a pre-API-11 project. Instead of just displaying an error
message, you now get a dialog which asks if you want to install the
project, and if you click the "Install" button it invokes the SDK
manager to install the right package, and then copies it into the
project.
In addition, the fragment selector now has a "Create New" action which
invokes the New Class wizard pre-configured with the right fragment
class.
Change-Id: I4ce1b51fbfe939a21e91379eb6b77ff722c13f0f
Romain Guy [Thu, 19 May 2011 22:00:26 +0000 (15:00 -0700)]
Allow HV to work on user builds.
Change-Id: If0f2a79b54abf9a9d8782827b083f10d5d2f2a7e
Raphael Moll [Fri, 20 May 2011 19:26:02 +0000 (12:26 -0700)]
Merge AdtUpdateDialog CL on top of latest SdkMan2
This is a merge/conflict resolution to correctly
merge the recent AdtUpdateDialog CL on top of the
recent SdkMan2 changes.
Change-Id: If3461381bfae3d820465a51107b1bcca0896f611
Raphael Moll [Wed, 18 May 2011 16:38:39 +0000 (09:38 -0700)]
SdkMan2: Use IDE's log when available.
Change-Id: Iede7f4f9c1a7bbfbdcbb096f489616478ba94465
Brett Chabot [Wed, 11 May 2011 02:43:15 +0000 (19:43 -0700)]
Make instrumentation test failure message more verbose.
Bug
3443053
Change-Id: I12ed20ac93db92ea5cf7dcb1984bc81be242ad9b
Raphael Moll [Wed, 18 May 2011 16:36:38 +0000 (09:36 -0700)]
SdkMan2: don't display update packages as sub-items.
Change-Id: I3261be52c637a49dbeba7b373947eb27807a05f9
Raphael Moll [Tue, 17 May 2011 21:34:34 +0000 (14:34 -0700)]
Mechanism to disable SwtMenuBar in SdkMan2
The SDK Manager 2 should not try to change the
menu bar when invoked from Eclipse. Actually it
can't because the SwtMenuBar lib isn't even present
to it crashes with a NoClassDef exception.
This CL adds the notion of "invocation context" so
that we know what is invoking the manager and we can
change the UI accordingly.
Change-Id: I606850a20fbc5f9d2d1d4fd0e16aa0bd71ef41c7
Raphael Moll [Tue, 17 May 2011 19:59:04 +0000 (12:59 -0700)]
Cleanup IUpdaterWindow in SdkManager.
The interface was supposed to be for the internal
window implementation. The public UpdaterWindow
does not need this interface.
Change-Id: Iddeb46fd7ac6988e9b880fb9fadace4d4d8693a4
Raphael Moll [Fri, 20 May 2011 19:00:59 +0000 (12:00 -0700)]
Merge "SDK Manager dialog to perform specific updates from ADT."
Raphael Moll [Thu, 19 May 2011 04:16:38 +0000 (21:16 -0700)]
SDK Manager dialog to perform specific updates from ADT.
As a working case example, this adds an ADT project
context menu to add the Android Compatibility JAR
to an android project.
Change-Id: Icd86930b72558240dc9f5a6f732478253b8cb0fb
The Android Open Source Project [Fri, 20 May 2011 00:21:35 +0000 (17:21 -0700)]
merge from tools-adt_r11
Change-Id: Ieeac609b8cee528188cd05a39da1f31c2bd83880
Tor Norbye [Fri, 20 May 2011 00:15:42 +0000 (17:15 -0700)]
Merge "Update changes.txt" into tools-adt_r11
Tor Norbye [Thu, 19 May 2011 20:52:31 +0000 (13:52 -0700)]
Update changes.txt
Change-Id: I30fde6f00a967dd3cee5c02b4f4fb95409a125a0
Tor Norbye [Fri, 20 May 2011 00:03:48 +0000 (17:03 -0700)]
Merge "Update changes.txt"
Xavier Ducrohet [Thu, 19 May 2011 22:46:09 +0000 (15:46 -0700)]
Merge "Fix potential stackoverflow in theme detection."
Xavier Ducrohet [Thu, 19 May 2011 21:44:02 +0000 (14:44 -0700)]
Fix potential stackoverflow in theme detection.
Change-Id: I19d2a3c9c6802b3e1c065ca36828d2b672130630
The Android Open Source Project [Thu, 19 May 2011 21:21:58 +0000 (14:21 -0700)]
merge from tools-adt_r11
Change-Id: Iaf1edd6850ad25451d8d5aa54642cc0eb56184da
Xavier Ducrohet [Thu, 19 May 2011 21:20:07 +0000 (14:20 -0700)]
Merge "Merge
3586fef5 from do not merge." into tools-adt_r11
Xavier Ducrohet [Thu, 19 May 2011 21:19:55 +0000 (14:19 -0700)]
Merge "Merge
677a2489 from do not merge." into tools-adt_r11
The Android Open Source Project [Thu, 19 May 2011 21:07:38 +0000 (14:07 -0700)]
merge from tools-adt_r11
Change-Id: I7a5957245c3e386eecada94b3b929eeb21bb5d1b
The Android Open Source Project [Thu, 19 May 2011 21:00:15 +0000 (14:00 -0700)]
merge from tools-adt_r11
Change-Id: I32b744486356a0ad48afb9d0f4d99174c2fdfea1
Tor Norbye [Thu, 19 May 2011 20:52:31 +0000 (13:52 -0700)]
Update changes.txt
Change-Id: Ic53c7174d4ed74b94cc24680e00737ddeaad024b
Xavier Ducrohet [Thu, 19 May 2011 18:29:32 +0000 (11:29 -0700)]
Merge
3586fef5 from master. do not merge.
Add method to LayoutLibrary to query layoutlib api level and rev.
Change-Id: Ib34251b690c18167f69a5b389fcabddbf8bb0aa1
Xavier Ducrohet [Thu, 19 May 2011 00:11:35 +0000 (17:11 -0700)]
Merge
677a2489 from master. do not merge.
Add revision number to the layoutlib.
Change-Id: Icfceb6b6328ed445ecc1bdefe7fc14192ba39328
Xavier Ducrohet [Thu, 19 May 2011 18:39:24 +0000 (11:39 -0700)]
Merge "Add method to LayoutLibrary to query layoutlib api level and rev."
Xavier Ducrohet [Thu, 19 May 2011 18:29:32 +0000 (11:29 -0700)]
Add method to LayoutLibrary to query layoutlib api level and rev.
Change-Id: Ib70e560e7d0be88305383aac18726858d91990ae
Xavier Ducrohet [Thu, 19 May 2011 18:19:47 +0000 (11:19 -0700)]
Merge "Add revision number to the layoutlib."
Tor Norbye [Thu, 19 May 2011 15:58:33 +0000 (08:58 -0700)]
Merge "Migrate render target settings to released versions" into tools-adt_r11