OSDN Git Service
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
Tor Norbye [Tue, 17 May 2011 23:34:16 +0000 (16:34 -0700)]
Migrate render target settings to released versions
When loading the project's render target setting (which as of ADT 11
is per project rather than per layout), check to see if it has a code
name, and if so, see if the user has the final version of the platform
installed as well. If so, migrate the render target to the final
version instead since the user probably did not intentionally want to
stay with the pre-release version after installing the final version.
Change-Id: I4cdfbb9670a042cf342d2c371ef123eff3959ff2
Tor Norbye [Thu, 19 May 2011 15:54:12 +0000 (08:54 -0700)]
Merge "Improve the choice of default configuration" into tools-adt_r11
Tor Norbye [Tue, 17 May 2011 22:49:50 +0000 (15:49 -0700)]
Improve the choice of default configuration
When you open a new layout, the layout editor needs to pick an initial
configuration for the layout. Currently, the choice of layout is
based on the project API level (such that it picks tablet screen and
landscape orientation for API 11, and phone and portrait for lower
APIs).
This changeset adds another factor: the currently used configuration.
If you have another layout visible and you open a new layout, then the
configuration for the current layout will be used for the new layout
(if it is a compatible match).
Change-Id: I66302e7ffb13c9b66e6fd0f7f347ebf4df142f77
Tor Norbye [Thu, 19 May 2011 15:44:01 +0000 (08:44 -0700)]
Merge "Fix merge error" into tools-adt_r11
Tor Norbye [Thu, 19 May 2011 15:42:33 +0000 (08:42 -0700)]
Fix merge error
Change-Id: I8b21078fe6486e2ee40ec5beb50de4046e1623f7
Tor Norbye [Thu, 19 May 2011 15:36:12 +0000 (08:36 -0700)]
Merge "Add preview support for GridViews"
Tor Norbye [Mon, 2 May 2011 20:38:51 +0000 (13:38 -0700)]
Add preview support for GridViews
GridViews are another AdapterView subclass. This changeset adds
preview support for GridViews by modifying the ListView preview
support to also accommodate GridViews.
Change-Id: I5af0a4c7e270cfa23c609be316d01dfb188a051b
Tor Norbye [Thu, 19 May 2011 15:24:05 +0000 (08:24 -0700)]
Merge "Fix auto-merge"
Tor Norbye [Thu, 19 May 2011 15:22:04 +0000 (08:22 -0700)]
Fix auto-merge
A change that was cherrypicked from the external master into the
tools-r11 branch was automerged back into the external master in such
a way that a method and a field got duplicated. This CL fixes the
merge.
Change-Id: I5b05c8a9477b4afb669efd1904c1415925d25307
Xavier Ducrohet [Thu, 19 May 2011 00:11:35 +0000 (17:11 -0700)]
Add revision number to the layoutlib.
Change-Id: I9a990c41c46ce9901a241b18aee00d1fc4c84383
The Android Open Source Project [Thu, 19 May 2011 00:33:56 +0000 (17:33 -0700)]
merge from tools-adt_r11
Change-Id: Ic374b2d4185f1c3c4dbad2ea81b901fe9b07666a
Tor Norbye [Thu, 19 May 2011 00:21:52 +0000 (17:21 -0700)]
Merge "Add Request Focus to textfields" into tools-adt_r11
The Android Open Source Project [Wed, 18 May 2011 22:07:57 +0000 (15:07 -0700)]
merge from tools-adt_r11
Change-Id: I0f0b1896177b21444622b048e77e594c18cb12d2
Tor Norbye [Wed, 18 May 2011 20:02:06 +0000 (13:02 -0700)]
Merge "Migrate render target settings to released versions"
Tor Norbye [Tue, 17 May 2011 23:34:16 +0000 (16:34 -0700)]
Migrate render target settings to released versions
When loading the project's render target setting (which as of ADT 11
is per project rather than per layout), check to see if it has a code
name, and if so, see if the user has the final version of the platform
installed as well. If so, migrate the render target to the final
version instead since the user probably did not intentionally want to
stay with the pre-release version after installing the final version.
Change-Id: Ic45232b5dc691b770045c3281f2c36b580347784
Tor Norbye [Wed, 18 May 2011 19:58:26 +0000 (12:58 -0700)]
Merge "Improve the choice of default configuration"
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: Ie9e1ab07c4f7ea701e9fac17f6c82e52656bc755
Tor Norbye [Tue, 17 May 2011 22:49:50 +0000 (15:49 -0700)]
Improve the choice of default configuration
When you open a new layout, the layout editor needs to pick an initial
configuration for the layout. Currently, the choice of layout is
based on the project API level (such that it picks tablet screen and
landscape orientation for API 11, and phone and portrait for lower
APIs).
This changeset adds another factor: the currently used configuration.
If you have another layout visible and you open a new layout, then the
configuration for the current layout will be used for the new layout
(if it is a compatible match).
Change-Id: I601b4373514cb30d6051e9de1bfa2ad91ff1b5f4
Tor Norbye [Wed, 18 May 2011 19:22:25 +0000 (12:22 -0700)]
Merge "Binary XML editor" into tools-adt_r11
Tor Norbye [Wed, 18 May 2011 19:15:17 +0000 (12:15 -0700)]
Merge "Fix bug in editor open utility" into tools-adt_r11
Tor Norbye [Wed, 18 May 2011 19:15:03 +0000 (12:15 -0700)]
Merge "Fragment Rendering Support" into tools-adt_r11
Tor Norbye [Wed, 18 May 2011 19:14:43 +0000 (12:14 -0700)]
Merge "Basic fragment support" into tools-adt_r11
Tor Norbye [Wed, 18 May 2011 19:14:29 +0000 (12:14 -0700)]
Merge "Make Go To Declaration work for <fragment> names." into tools-adt_r11
Tor Norbye [Wed, 18 May 2011 19:14:11 +0000 (12:14 -0700)]
Merge "Custom View handling improvements" into tools-adt_r11
Tor Norbye [Wed, 18 May 2011 19:13:35 +0000 (12:13 -0700)]
Merge "Escape Strings extracted with the Extract String refactoring" into tools-adt_r11
Haris Peco [Fri, 6 May 2011 23:06:59 +0000 (01:06 +0200)]
Binary XML editor
This change contains the workaround for
http://code.google.com/p/android/issues/detail?id=15003
For details,
see http://code.google.com/p/android/issues/detail?id=15003#c50
Change-Id: I6485d32620a23c17879922155a8cfb6e4290f05e
Tor Norbye [Mon, 16 May 2011 22:14:24 +0000 (15:14 -0700)]
Fix bug in editor open utility
The code to open a file (called by Go To Declaration, Show Include
etc) handles two scenarios:
(1) The file is in the workspace - open using Eclipse IFile mechanism
(2) The file is outside the workspace - open using the fallback
external storage (which means you get a plain XML editor)
There's a third scenario: the file is not in the workspace, but is
part of a project in the workspace so it does have a valid IFile.
(This can happen if you import a project but choose not to copy the
contents into the workspace). This changeset adjusts the code to open
up an editor such that it handles this third scenario and we get our
own XML editors for these types of files.
Change-Id: I040e1b899cd38bbda3fcf3475cc4dfb541d10016
Tor Norbye [Mon, 16 May 2011 21:02:15 +0000 (14:02 -0700)]
Fragment Rendering Support
This changeset adds designtime-previewing of fragments, where
a layout which contains fragments will show the contents of
the fragments inline.
Initially, the fragments are empty, but you can right click on them to
bring up a context menu where you can choose which layout to show at
designtime. This is persisted across IDE sessions, just like the
ListView render preview.
In addition to the generic layout chooser, all layout references found
in the associated Fragment class (usually what you want) are listed
directly in the menu.
Change-Id: Iff3e6e5cbf87a19bdb61e677a63f663ca6e4848b
Tor Norbye [Sun, 15 May 2011 20:14:19 +0000 (13:14 -0700)]
Basic fragment support
This changeset adds preliminary support for fragments:
* Add <fragment> to the palette, along with a drop handler which pops
up a class chooser to pick the Fragment class; all project
implementations of android.app.Fragment and
android.support.v4.app.Fragment are listed.
* Adds a fragment descriptor such that code completion works for
<fragment> elements
* Fix project callback such that it does not complain about a missing
class "fragment".
* Fix outline to display the name of the fragment rather than the
fragment tag name.
* This changeset also centers the label in MockViews since those are
still used to render fragments
Conflicts:
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/LayoutDescriptors.java
Change-Id: I6f39f0c29a0cf21799fa8a55406eeae1e3beb57f
Tor Norbye [Thu, 28 Apr 2011 22:51:38 +0000 (15:51 -0700)]
Make Go To Declaration work for <fragment> names.
Conflicts:
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LayoutConstants.java
Change-Id: I5260aacb7d7a14141f43d9a65bb4bb87627d17c2
Tor Norbye [Fri, 13 May 2011 20:25:15 +0000 (13:25 -0700)]
Custom View handling improvements
First and foremost, allow custom views to accept children such that
you can drag & drop children into the custom view in the outline.
Second, prevent an NPE which can occur if you drag into a layout where
the root element is a custom view.
Third, handle <view> (not <View>) better: provide a custom icon, and
inline the view class name in the outline label.
Fourth, allow double clicks (in addition to ctrl-click which is already
supported) on the custom views in the palette to allow jumping to the
custom view code.
Change-Id: I13c2bf2f4169185c9fcc893ce487f2abdac46802
Conflicts:
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/LayoutDescriptors.java
Tor Norbye [Fri, 13 May 2011 00:11:25 +0000 (17:11 -0700)]
Escape Strings extracted with the Extract String refactoring
Escape any single or double quotes inside the string
value definition in strings.xml:
This'll work => "This'll work"
Escape '" => Escape \'\"
Change-Id: I21cb506e10e837feb0e435a21cb50aaa5342f0fa
Tor Norbye [Tue, 17 May 2011 19:02:59 +0000 (12:02 -0700)]
Merge "Fix bug in editor open utility"
The Android Open Source Project [Tue, 17 May 2011 18:50:05 +0000 (11:50 -0700)]
merge from tools-adt_r11
Change-Id: Ia7f930ac13527f3688164c04863c216ab15b30f7
Tor Norbye [Mon, 16 May 2011 22:14:24 +0000 (15:14 -0700)]
Fix bug in editor open utility
The code to open a file (called by Go To Declaration, Show Include
etc) handles two scenarios:
(1) The file is in the workspace - open using Eclipse IFile mechanism
(2) The file is outside the workspace - open using the fallback
external storage (which means you get a plain XML editor)
There's a third scenario: the file is not in the workspace, but is
part of a project in the workspace so it does have a valid IFile.
(This can happen if you import a project but choose not to copy the
contents into the workspace). This changeset adjusts the code to open
up an editor such that it handles this third scenario and we get our
own XML editors for these types of files.
Change-Id: I0fc89316e4625fcf66dd61060cd9b00054bc5464
Xavier Ducrohet [Tue, 17 May 2011 18:45:38 +0000 (11:45 -0700)]
Merge "Merge
a109773a from do not merge." into tools-adt_r11
Xavier Ducrohet [Tue, 17 May 2011 01:37:22 +0000 (18:37 -0700)]
Merge
a109773a from master. do not merge.
Update layoutlib api level to 6.
This will make earlier ADT versions force the user to update.
Change-Id: I20158fb894ba0a88d981301a003e7f09719bab43
Tor Norbye [Tue, 17 May 2011 18:41:29 +0000 (11:41 -0700)]
Merge "Fragment Rendering Support"
Tor Norbye [Mon, 16 May 2011 21:02:15 +0000 (14:02 -0700)]
Fragment Rendering Support
This changeset adds designtime-previewing of fragments, where
a layout which contains fragments will show the contents of
the fragments inline.
Initially, the fragments are empty, but you can right click on them to
bring up a context menu where you can choose which layout to show at
designtime. This is persisted across IDE sessions, just like the
ListView render preview.
In addition to the generic layout chooser, all layout references found
in the associated Fragment class (usually what you want) are listed
directly in the menu.
Change-Id: Ib7f8caae568eff94a57fd50b8e054f5fa52f3da6
Tor Norbye [Tue, 17 May 2011 18:31:05 +0000 (11:31 -0700)]
Merge "Basic fragment support"
Xavier Ducrohet [Tue, 17 May 2011 18:30:15 +0000 (11:30 -0700)]
Merge "Update layoutlib api level to 6."
The Android Open Source Project [Tue, 17 May 2011 18:05:24 +0000 (11:05 -0700)]
merge from tools-adt_r11
Change-Id: Ibd616f054c3774c41e10b72e9995d5b0eab78d33
Xavier Ducrohet [Tue, 17 May 2011 17:47:34 +0000 (10:47 -0700)]
Merge "Merge
580ecb7a from do not merge." into tools-adt_r11