OSDN Git Service
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
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
Xavier Ducrohet [Mon, 16 May 2011 23:00:10 +0000 (16:00 -0700)]
Merge
580ecb7a from master. do not merge.
Add baseline/margins to ViewInfo.
Also make it so that older layoutlib that are using API5 return the
value through reflection (done in LayoutLibrary.)
Change-Id: Ied102625430b53f9b5e62aa738c8c598054cc266
The Android Open Source Project [Tue, 17 May 2011 17:46:00 +0000 (10:46 -0700)]
merge from tools-adt_r11
Change-Id: I2fe7e10a2c93a7752174e287286c5ac9b82dc1e0
Raphael Moll [Tue, 17 May 2011 17:32:54 +0000 (10:32 -0700)]
Merge "Plug in about/settings for SDK Manager 2."
Raphael Moll [Tue, 17 May 2011 17:32:48 +0000 (10:32 -0700)]
Merge "Adjust "Compiler compliance" error to be more useful."
Raphael Moll [Tue, 17 May 2011 17:32:43 +0000 (10:32 -0700)]
Merge "Fix space-in-dir issue with Proguard for the ant case."
Raphael Moll [Tue, 17 May 2011 17:32:19 +0000 (10:32 -0700)]
Merge "Fix space-in-path proguard for ADT Export."
Raphael Moll [Tue, 17 May 2011 17:32:10 +0000 (10:32 -0700)]
Merge "Fix proguard wrapper to capture all args."
Raphael Moll [Tue, 17 May 2011 16:36:31 +0000 (09:36 -0700)]
Merge "Merge 'Remove "Android Tools > Convert to Android Project"' into tools-adt_r11" into tools-adt_r11
Tor Norbye [Tue, 17 May 2011 14:48:45 +0000 (07:48 -0700)]
Merge "Binary XML editor"
Xavier Ducrohet [Tue, 17 May 2011 01:37:22 +0000 (18:37 -0700)]
Update layoutlib api level to 6.
This will make earlier ADT versions force the user to update.
Change-Id: I5331da72306453647f8d48ddb3b5d4cd4e662550
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: I6d653aab2c117b426eb4a461ce5ed2a9566245f2
Xavier Ducrohet [Tue, 17 May 2011 00:26:58 +0000 (17:26 -0700)]
Merge "Add baseline/margins to ViewInfo."
Xavier Ducrohet [Mon, 16 May 2011 23:00:10 +0000 (16:00 -0700)]
Add baseline/margins to ViewInfo.
Also make it so that older layoutlib that are using API5 return the
value through reflection (done in LayoutLibrary.)
Change-Id: I3a32666e525f0f1d37a13e670d1d1c659b8e2027
Raphael Moll [Mon, 16 May 2011 23:30:53 +0000 (16:30 -0700)]
Merge "Form editor up/down move accross siblings."
Raphael Moll [Mon, 16 May 2011 23:30:44 +0000 (16:30 -0700)]
Merge "Fix Up/Down buttons in UiTreeBlock form editor."
Raphael Moll [Mon, 16 May 2011 20:47:42 +0000 (13:47 -0700)]
Merge 'Remove "Android Tools > Convert to Android Project"' into tools-adt_r11
The feature to convert a Java Project into an
Android Project is broken. It's also quite irrelevant
now since project are better created using the NPW.
SDK Bug:
3259855
(cherry picked from commit
7f8f80cfe2a29b7ebaf139fb4228ad31192fb8a9)
Change-Id: Ifb5e93d2dcf6853136cd4add5e4af6b14fafec35
Raphael Moll [Mon, 16 May 2011 21:59:02 +0000 (14:59 -0700)]
Merge "Remove "Android Tools > Convert to Android Project""
Raphael Moll [Mon, 16 May 2011 21:54:20 +0000 (14:54 -0700)]
Form editor up/down move accross siblings.
Up/down in the tree editor work at the XML level.
In a manifest, the tree block filters elements so
that only certain types are visible. Take this
into account when moving elements up/down so that
only siblings that match a given display filter
are used.
SDK Bugs:
2274556,
2274575
Change-Id: I81412b70f146a40169c47cba277fa3b3fceb7be3
Raphael Moll [Mon, 16 May 2011 20:47:42 +0000 (13:47 -0700)]
Remove "Android Tools > Convert to Android Project"
The feature to convert a Java Project into an
Android Project is broken. It's also quite irrelevant
now since project are better created using the NPW.
SDK Bug:
3259855
Change-Id: I80e697651adba5a44beb3b53b31887d4e65b0868
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
Change-Id: I6e062970b335d9c95870f181ed408960978c423e
Raphael Moll [Mon, 16 May 2011 20:14:33 +0000 (13:14 -0700)]
Fix Up/Down buttons in UiTreeBlock form editor.
In the manifest editor (and actually all other form
editors), it was possible move elements up/down
using the Up/Down buttons. However this allowed a
user to move an element in a parent that would not
accept that parent. The tree block would then not
display the element any more and a user would have
had to switch to the XML view to correct this.
This fix thus makes sure a parent will accept the
node being moved. The up/down buttons are also
grayed appropriately if the action isn't possible.
SDK Bugs:
2274556,
2274575
Change-Id: If1dd61f1260063e8ecb9c48330e6c6b2dc3c7228
Raphael Moll [Sat, 14 May 2011 02:39:39 +0000 (19:39 -0700)]
Merge "Move Grid{Data,Layout}Builder to SDK UI Lib"
Raphael Moll [Sat, 14 May 2011 02:39:32 +0000 (19:39 -0700)]
Merge "Refactor some common Dialog methods in a base class."
Tor Norbye [Sat, 14 May 2011 02:20:01 +0000 (19:20 -0700)]
Merge "Make Go To Declaration work for <fragment> names."
Tor Norbye [Thu, 28 Apr 2011 22:51:38 +0000 (15:51 -0700)]
Make Go To Declaration work for <fragment> names.
Change-Id: Ib2e8d8b93cdb52717719296dec0cbcf9780802ff
Tor Norbye [Sat, 14 May 2011 02:08:23 +0000 (19:08 -0700)]
Merge "Custom View handling improvements"
Raphael Moll [Fri, 13 May 2011 07:05:21 +0000 (00:05 -0700)]
Plug in about/settings for SDK Manager 2.
Refactor SDK Updater pages.
Change-Id: I84357e34c66e8976843cbfb4a5413ac28b899279
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
Raphael Moll [Fri, 13 May 2011 18:27:20 +0000 (11:27 -0700)]
Move Grid{Data,Layout}Builder to SDK UI Lib
Change-Id: Ib234e75e80a14b56461786ffdaffd9d77960d1b5
Raphael Moll [Fri, 13 May 2011 05:49:07 +0000 (22:49 -0700)]
Refactor some common Dialog methods in a base class.
Change-Id: I4a81badcfeeca70fde747590daee9ae91c17795f
Tor Norbye [Fri, 13 May 2011 01:59:58 +0000 (18:59 -0700)]
Merge "Escape Strings extracted with the Extract String refactoring"
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: I00df6491560c0ab3ca95f485ca508f9717be19f4
Raphael Moll [Thu, 12 May 2011 23:13:08 +0000 (16:13 -0700)]
Adjust "Compiler compliance" error to be more useful.
Changed the compiler compliance check to:
- Indicate the current invalid value (good for bug reports too),
- Indicate both 5.0 and 6.0 (aka 1.5 and 1.6) are supported,
- Explicitely name the menu item that can fix the situation
(it wasn't clear the current suggestion was the menu item name
as it looked just like a regular sentence.)
SDK Bug: http://code.google.com/p/android/issues/detail?id=16512
Change-Id: I2ee295ba37af5b15a27b288ba807e6f4964ef632
Raphael Moll [Wed, 11 May 2011 05:34:45 +0000 (22:34 -0700)]
Fix space-in-dir issue with Proguard for the ant case.
This fixes the proper way to quote the compound paths
arguments given to proguard. Each individual path is
quoted if it contains spaces.
Quoting for -libraryjars fixes the issue for the SDK
install path containing a space.
Quoting for -injars and the other arguments fixes the
issue for the project path containing a space (although
the ant build will fail later at the dx phase in this
case.)
Change-Id: I74283b4f1b19c353c1a5ed36e4d0ec58676b6a79
Raphael Moll [Tue, 10 May 2011 16:56:21 +0000 (09:56 -0700)]
Fix space-in-path proguard for ADT Export.
Proguard requires paths that contain spaces to
be quoted individually (e.g. for -injars, we need
something like -injar 'path 1';'path 2').
On top of that, we need to quote the quoted
argument to make sure the proguard.bat wrapper
preserves the quoting.
Change-Id: I3f9bd2378f95e6f2114987d84842c0e231927629
Raphael Moll [Tue, 10 May 2011 03:08:02 +0000 (20:08 -0700)]
Fix proguard wrapper to capture all args.
Change-Id: Ic926f3d5c39a3f14c9a54de70576c94508acf2ba
Bill Napier [Wed, 11 May 2011 16:43:50 +0000 (09:43 -0700)]
Merge "Use enum for converting TouchPressType values"
The Android Open Source Project [Mon, 9 May 2011 15:06:50 +0000 (08:06 -0700)]
Ignore from tools_r10
Change-Id: I9a503563a338cf29fe1dfcd4cb50226831e8f2da
Raphael Moll [Sat, 7 May 2011 00:10:00 +0000 (17:10 -0700)]
Merge "Fix launchers for SDK tools using swtmenubar."
Raphael [Fri, 6 May 2011 01:48:26 +0000 (18:48 -0700)]
Merge "Fix tools_r10 SDK build." into tools_r10
Raphael [Fri, 6 May 2011 01:47:10 +0000 (18:47 -0700)]
Fix tools_r10 SDK build.
We activated the sdk_repo build option, which means to generate
the repository XML we need some min-tools-rev info defined in the
tools source props.
(Merged from old change id: I01fecc45bc1317c0e746815924ac8afe04491ad5)
Change-Id: I1f3dda47ffca2a4269799c0d433b1dd6e235237a
The Android Open Source Project [Thu, 5 May 2011 23:53:21 +0000 (16:53 -0700)]
merge from tools_r10
Change-Id: Ie6fc2fdbfa33b9b88ae2f845941cd047735e42d8
Raphaël Moll [Thu, 5 May 2011 23:47:33 +0000 (16:47 -0700)]
Merge "Fix tools_r10: some emulator files moved to development.git" into tools_r10
David 'Digit' Turner [Fri, 11 Mar 2011 14:59:18 +0000 (15:59 +0100)]
Fix tools_r10: some emulator files moved to development.git
Original msg:
---
Prepare for moving platform-specific emulator modules to development.git
We need to move the platform-specific modules to development.git to
avoid some clashes. This patch uses a guard Make variable to ensure that
each module is only built once.
The plan is to simply copy these modules to development.git, then remove
the current ones from sdk.git. The guard variable is here to ensure that
the transition happens smoothly, i.e. if a build contains modules in
both directories, only one of them will be built.
(cherry picked from commit
ec970d641caedee9656ef8fcc7cdd60e6812b75d)
Change-Id: I79c2af1da7d27cb8b75ab366e37524e1a929426f
Raphael Moll [Thu, 5 May 2011 18:20:26 +0000 (11:20 -0700)]
Fix launchers for SDK tools using swtmenubar.
Change-Id: Iba5860db0a56ab508d1ce155d0e079ab37eb2bc9
Tor Norbye [Thu, 5 May 2011 01:00:46 +0000 (18:00 -0700)]
Merge "hierarchyviewer can dump displaylists for selected nodes."
Chet Haase [Fri, 22 Apr 2011 23:24:23 +0000 (16:24 -0700)]
hierarchyviewer can dump displaylists for selected nodes.
In hierarchyviewer (and hierarchyviewer1):
The displaylist for the selected node (if there is one) is output
into logcat when the "Dump DisplayList" button is clicked.
Change-Id: I1996bbd1cbe32d8bc25708453c777800385fe444
The Android Open Source Project [Wed, 4 May 2011 21:43:40 +0000 (14:43 -0700)]
merge from tools_r11
Change-Id: I10f11860b33c7f9cd9209f986d5beb9c819f6401
Raphael Moll [Wed, 4 May 2011 21:35:08 +0000 (14:35 -0700)]
Merge "Add emulator-arm to SDK, including Windows SDK." into tools_r11
Raphael Moll [Wed, 4 May 2011 21:32:41 +0000 (14:32 -0700)]
Add emulator-arm to SDK, including Windows SDK.
Also fixes the fact the Windows SDK wasn't building emulator-arm
nor emulator-x86.
SDK BUG:
4377649
Change-Id: I1450a8c73e0078e69ccd28b220bf37ecd0a6fd5c
The Android Open Source Project [Wed, 4 May 2011 21:19:55 +0000 (14:19 -0700)]
merge from tools_r11
Change-Id: Ic97feed5fa7753db8ead690b6e714f118a8d895b
Raphaël Moll [Wed, 4 May 2011 21:14:50 +0000 (14:14 -0700)]
Merge "Merge "emulator: qemud: shut-up debug messages."" into tools_r11
Raphael Moll [Wed, 4 May 2011 21:14:30 +0000 (14:14 -0700)]
Merge "Merge "SdkManager: handle missing platforms/ and add-ons/ folders."" into tools_r11
David 'Digit' Turner [Mon, 2 May 2011 11:34:26 +0000 (13:34 +0200)]
Merge "emulator: qemud: shut-up debug messages."
This change is already under development/tools/emulator/system/qemud/qemud.c
However, this sdk/.../qemud.c source file was first deleted, then reverted,
with the change in between. So apply it here too.
(cherry picked from commit
dbf6055b33f2c9442f8436926082d4deb3540e8f)
Change-Id: I91613cfee2ee326904b0f2345cef5b972de609bf
Raphael Moll [Mon, 2 May 2011 21:24:26 +0000 (14:24 -0700)]
Merge "SdkManager: handle missing platforms/ and add-ons/ folders."
A while ago, when we were dealing with monolithics SDKs,
the strategy was that we wanted to make sure that
the 'android' command was invoked from a properly setup
SDK folder. Consequently the SdkManager required at least
the platforms/ and add-ons/ folders to be present, even if
empty.
I don't think that behavior is really necessary anymore.
The 'android' tool is invoked with knowledge from its tools
folder, so we can safely assume the top parent is "the SDK
folder" and create these directories if they are missing.
We do however try to create them as early as possible if
they are missing, so that the tool aborts early if we can't
create them. The other alternative would be to just try to
create them when we're actually installing a package.
(cherry picked from commit
a77c147c9e7ed3ef0c99cb2cdf986603e6d229cf)
Change-Id: I6da1710b1a1844931bdb99d840ae575f53a9b947
The Android Open Source Project [Wed, 4 May 2011 20:21:29 +0000 (13:21 -0700)]
merge from tools_r11
Change-Id: Idb34e37a903b038da3d45ce16f5788914db034e7
Tor Norbye [Wed, 4 May 2011 20:13:59 +0000 (13:13 -0700)]
Merge "Merge "Update changes.txt for ADT 11"" into tools_r11
Tor Norbye [Wed, 4 May 2011 20:13:51 +0000 (13:13 -0700)]
Merge "Merge "Add code completion support for drawables, animations and colors"" into tools_r11
Tor Norbye [Wed, 4 May 2011 20:13:42 +0000 (13:13 -0700)]
Merge "Merge "Misc fixes"" into tools_r11
Tor Norbye [Wed, 4 May 2011 20:13:31 +0000 (13:13 -0700)]
Merge "Merge "Improve custom view search and filtering"" into tools_r11
Tor Norbye [Fri, 29 Apr 2011 01:41:09 +0000 (18:41 -0700)]
Merge "Update changes.txt for ADT 11"
(cherry picked from commit
3dcfd76ce0f20f602f43ed0061a5ef99fe4c50d3)
Change-Id: I7945fae86ad7ff95f1bae3166e7e1bc32bfdc32f
Tor Norbye [Fri, 22 Apr 2011 04:25:15 +0000 (21:25 -0700)]
Merge "Add code completion support for drawables, animations and colors"
This changeset adds in descriptor metadata and XML editors for:
- Drawables (res/drawable/)
- Animations (res/anim/)
- Animators (res/animator/)
- Colors (res/color)
These types have also been added to the New XML File wizard.
There is some specialized completion support for animators:
- Completing on the propertyName property of <objectAnimator> will
offer the various integer and float properties in views
- Completion for the interpolator property shows the framework
interpolators immediately and on top (instead of having to complete
the individual resource paths @android: and anim/ first
There is also a new quickfix and marker resolution for the AAPT error
which complains about an unbound prefix. This will insert a
xmlns:android="http://schemas.android.com/apk/res/android" attribute
declaration on the root element.
This CL also includes a fix to make the New XML File Wizard preselect
the current project in more scenarios.
NOTE: This changeset adds new XML editors for these resource types.
It does not attempt to update previous editor bindings for files of
the given type, so to test this you may need to use "Open With" in the
package explorer to pick the right file type.
A subsequent CL will try to migrate settings over to these editors,
but that work will tie into another effort: merging all these
different editors into a single editor class that does its own content
type switching and different viewparts for the other tabs.
(cherry picked from commit
aaa917c9c5e6f974ca20b94adfd53d1bf01bb54e)
Change-Id: Iddc2405c4802d43126d9b2172f86869de80bef10
Tor Norbye [Mon, 2 May 2011 20:40:02 +0000 (13:40 -0700)]
Merge "Misc fixes"
This changeset fixes a couple of misc problems I ran into:
(1) Save the current file when double clicking on an included view.
When double clicking on an included view, the included view is
opened in a "Show Included" context where the including file is
surrounding the include. This will read the surrounding file from
disk, and if we don't save the file when opening the file then
it's possible to see a stale view (best case) or it won't work at
all if the include tag itself isn't in the saved version of the
file.
(2) Fix a bug in the "Select Same Type" context menu action where the
list was cleared before reading out the item to be selected.
(3) Filter out a few more properties from the Extract Style
refactoring dialog, and include margin attributes
(cherry picked from commit
2047b3b061e179faf6d613540a34cc7e6d492176)
Change-Id: I3c1c9d3094b7488ddf45abe6df4d686949eb8fd0
Tor Norbye [Sat, 30 Apr 2011 00:30:01 +0000 (17:30 -0700)]
Merge "Improve custom view search and filtering"
This change improves the code which identifies custom views in the
project.
It will now filter out a number of "false" matches:
- Classes that were only defined in a javadoc (these are included in
Eclipse type hierarchy search results)
- Anonymous classes
- Classes that extend View, but do not define one of the 3 base View
constructors:
View(Context context)
View(Context context, AttributeSet attrs)
View(Context context, AttributeSet attrs, int defStyle)
We can only instantiate custom views with one or more of these
constructor signatures at designtime.
It also fixes two additional bugs:
- It changes the search flags passed to the search engine which makes
it now find custom views that are static innerclasses.
- It fixes a bug in handling view descriptors which made the custom
view palette not work at all in some projects (in some case the
descriptor would be null, which caused an NPE which caused the whole
palette initialization to bail.) This is the bug which made me dig
through the custom view code and discover the above problems too.
(cherry picked from commit
916b78d9e78cb446d72de6cba30f2f395728f612)
Change-Id: I5a80e86dccb8b7fd339919e79e7ed59cd6357819
Tor Norbye [Wed, 4 May 2011 19:49:46 +0000 (12:49 -0700)]
Merge "Update changes.txt for ADT 11"
Tor Norbye [Fri, 29 Apr 2011 01:41:09 +0000 (18:41 -0700)]
Update changes.txt for ADT 11
Change-Id: Ic238223d22d5e86b481b8c790813dbc14e0d6bd7