OSDN Git Service

android-x86/sdk.git
12 years agoSdkMan2: Fix edge case when install/delete packages.
Raphael Moll [Fri, 5 Aug 2011 22:33:31 +0000 (15:33 -0700)]
SdkMan2: Fix edge case when install/delete packages.

One issue when installing or deleting packages is that
sometimes after an install the display would show both
the uninstalled and installed package. And when deleting
it would also show both states.
The core issue is that it's a bad idea to rely on
Set<>.contains() when your objects equality isn't quite
what the hash code says.

Or said otherwise, there's more than one definition
of "equals()" for Package objects. That is when a
package is installed or deleted, its internal state
changes and its archive changes (it looses or gain an
OS path), which changes the overall hash code but
at that point it's the same object from the user point
of view.

Anyway, long story made short: this fixes that.

Change-Id: I6ec705cc807d96d097cf9ea7faf8234f7ed34416

12 years agoSdkMan2: Show number of packages to install/delete
Raphael Moll [Fri, 5 Aug 2011 20:12:23 +0000 (13:12 -0700)]
SdkMan2: Show number of packages to install/delete

Change-Id: I2113998c9a7274d5c468f27f4b51b8d2293d0c17

12 years agoSdkMan2: Fix load when there are no remote sources.
Raphael Moll [Fri, 5 Aug 2011 17:50:29 +0000 (10:50 -0700)]
SdkMan2: Fix load when there are no remote sources.

There was a bug where the package loader would not show
all locally installed packages if it didn't find any
remote source (e.g. when there's no network).
This fixes it. Also adds a UT to cover this case.

Change-Id: I5ccfd91895cfece54f2c2cdff58040c5ae8d1e98

12 years agoMerge "Fix some UT."
Xavier Ducrohet [Fri, 5 Aug 2011 17:14:22 +0000 (10:14 -0700)]
Merge "Fix some UT."

12 years agoFix some UT.
Xavier Ducrohet [Fri, 5 Aug 2011 00:44:25 +0000 (17:44 -0700)]
Fix some UT.

Change-Id: Ia3ca9ef68d6435a323959913a6bd9298e9bcf0c9

12 years agoMerge "Add eclipse version to usage stat ping."
Xavier Ducrohet [Thu, 4 Aug 2011 23:55:02 +0000 (16:55 -0700)]
Merge "Add eclipse version to usage stat ping."

12 years agoMerge "Add pushFile/pullFile interface for IDevice."
Xavier Ducrohet [Thu, 4 Aug 2011 23:41:18 +0000 (16:41 -0700)]
Merge "Add pushFile/pullFile interface for IDevice."

12 years agoMerge "Split PackagesPage and PackageLoader inner classes."
Raphael Moll [Thu, 4 Aug 2011 23:41:10 +0000 (16:41 -0700)]
Merge "Split PackagesPage and PackageLoader inner classes."

12 years agoMerge "SDK Manager: refactor classes for manager 1 versus 2."
Raphael Moll [Thu, 4 Aug 2011 23:41:05 +0000 (16:41 -0700)]
Merge "SDK Manager: refactor classes for manager 1 versus 2."

12 years agoMerge "SdkManager2: UTs for initial platform selection."
Raphael Moll [Thu, 4 Aug 2011 23:41:01 +0000 (16:41 -0700)]
Merge "SdkManager2: UTs for initial platform selection."

12 years agoMerge "SdkMan2: only select recent new platforms."
Raphael Moll [Thu, 4 Aug 2011 23:40:54 +0000 (16:40 -0700)]
Merge "SdkMan2: only select recent new platforms."

12 years agoMerge "Fix NPE"
Tor Norbye [Thu, 4 Aug 2011 23:30:44 +0000 (16:30 -0700)]
Merge "Fix NPE"

12 years agoFix NPE
Tor Norbye [Thu, 4 Aug 2011 23:28:51 +0000 (16:28 -0700)]
Fix NPE

Change-Id: I044342e5aa6b3aaa87efdcc79bbcb3db93190252

12 years agoAdd eclipse version to usage stat ping.
Xavier Ducrohet [Thu, 4 Aug 2011 23:27:52 +0000 (16:27 -0700)]
Add eclipse version to usage stat ping.

Change-Id: I14dba0dd7cb900c2e700e4da055aee7bb7d1f9cd

12 years agoSplit PackagesPage and PackageLoader inner classes.
Raphael Moll [Thu, 4 Aug 2011 22:16:40 +0000 (15:16 -0700)]
Split PackagesPage and PackageLoader inner classes.

PackagesPage and PackageLoader have quite a number of inner
classes. This splits them in separate package-protected
classes, making the page source a tad shorter.

This is a pure refactoring move/rename. No logic is modified.

Change-Id: I88885aed40e34bd28de4b1ea4e1de66ea2ed89b8

12 years agoSDK Manager: refactor classes for manager 1 versus 2.
Raphael Moll [Thu, 4 Aug 2011 21:47:26 +0000 (14:47 -0700)]
SDK Manager: refactor classes for manager 1 versus 2.

This moves SDK Manager 1 versus 2 classes in different
packages, ..repository.sdkman1 versus ..repository.sdkman2.

There is no change to any actual logic. Only edits to fix
imports and make some classes public.

Change-Id: Ia5ea2ef55fb6913816b27d81c496434d80a00c58

12 years agoAdd pushFile/pullFile interface for IDevice.
Wei-Ning Huang [Thu, 4 Aug 2011 21:11:08 +0000 (05:11 +0800)]
Add pushFile/pullFile interface for IDevice.

Implement pushFile/pullFile methods for Device.

Change-Id: I8491f98fc46bbfd5f476b72e002cd97f63c56228

12 years agoMerge "Fix formatting bug for formatting ranges"
Tor Norbye [Thu, 4 Aug 2011 20:10:14 +0000 (13:10 -0700)]
Merge "Fix formatting bug for formatting ranges"

12 years agoMerge "Add tag-handling for Go To Matching in XML documents"
Tor Norbye [Thu, 4 Aug 2011 20:09:56 +0000 (13:09 -0700)]
Merge "Add tag-handling for Go To Matching in XML documents"

12 years agoMerge "Improve smart-indent handling in XML files"
Tor Norbye [Thu, 4 Aug 2011 20:09:46 +0000 (13:09 -0700)]
Merge "Improve smart-indent handling in XML files"

12 years agoSdkManager2: UTs for initial platform selection.
Raphael Moll [Thu, 4 Aug 2011 19:27:44 +0000 (12:27 -0700)]
SdkManager2: UTs for initial platform selection.

Change-Id: I4aef0e6ad8993e792a20f95f37a62f44e858b426

12 years agoSdkMan2: only select recent new platforms.
Raphael Moll [Wed, 3 Aug 2011 22:26:57 +0000 (15:26 -0700)]
SdkMan2: only select recent new platforms.

Try to add some heuristic to select new/updates
so that we only select new stuff from platforms
the user has or the top most recent platform.

Change-Id: I3b4c7a3b515bdee8393a248493d2dc475f2f5745

12 years agoMerge "Initial implementation of the new logcat panel."
Siva Velusamy [Thu, 4 Aug 2011 19:00:28 +0000 (12:00 -0700)]
Merge "Initial implementation of the new logcat panel."

12 years agoInitial implementation of the new logcat panel.
Siva Velusamy [Wed, 3 Aug 2011 18:19:33 +0000 (11:19 -0700)]
Initial implementation of the new logcat panel.

This logcat panel will show up in ddms if it is launched with -Dcom.android.ddms.useNewLogCatView.
Currently, this implementation only displays a table with a list of logcat messages. It lacks
features such as filters, go-to source of exception, export to log, user preferences, etc.
Future patches should enhance the UI to achieve feature parity with older UI.

Change-Id: I3dde3c590c839318ce57bb5f005627f580ebb06c

12 years agoMerge "Conditionally create old logcat view."
Siva Velusamy [Thu, 4 Aug 2011 18:54:16 +0000 (11:54 -0700)]
Merge "Conditionally create old logcat view."

12 years agoMerge "Convert tabs to spaces"
Siva Velusamy [Thu, 4 Aug 2011 17:58:06 +0000 (10:58 -0700)]
Merge "Convert tabs to spaces"

12 years agoConditionally create old logcat view.
Siva Velusamy [Tue, 2 Aug 2011 23:18:41 +0000 (16:18 -0700)]
Conditionally create old logcat view.

As a first step towards replacing the logcat view, wrap the code that creates
and manages the current logcat view to first check which implementation to use.
The old implementation is used unless a JVM property
"com.android.ddms.useNewLogCatView" is set.

Change-Id: Idbdfcc55f0f5f28f7004b010875b89de8a4cea12

12 years agoConvert tabs to spaces
Siva Velusamy [Tue, 2 Aug 2011 22:34:25 +0000 (15:34 -0700)]
Convert tabs to spaces

Change-Id: I7032663689943b22342b49736f0656df778cd456

12 years agoMerge "sdkman2: if nothing selected yet, select new/updates."
Raphael Moll [Thu, 4 Aug 2011 00:53:02 +0000 (17:53 -0700)]
Merge "sdkman2: if nothing selected yet, select new/updates."

12 years agoFix formatting bug for formatting ranges
Tor Norbye [Thu, 4 Aug 2011 00:34:25 +0000 (17:34 -0700)]
Fix formatting bug for formatting ranges

Fix bug discovered by Raphael, where you select a portion of a node
and then try to format it; the bug happens if the node is indented at
column 0.  I'll add unit tests for this in the next checkin along with
wider tests for node-replacements.

Change-Id: I6488dce530e0663c83b063da906ab6a5e0bcc1d6

12 years agoAdd tag-handling for Go To Matching in XML documents
Tor Norbye [Wed, 3 Aug 2011 23:43:19 +0000 (16:43 -0700)]
Add tag-handling for Go To Matching in XML documents

Eclipse has a Go to Matching feature, bound to Ctrl-Shift-P. However,
for XML documents it only works on the character level, so if the
caret is inside a tag it does nothing, and if you place it on an angle
bracket, it just jumps to the opposite angle bracket for the same tag.

This changeset adds a new character pair matcher which works at the
tag level, so if you for example place the caret anywhere in an end
tag, it will highlight the first character of the opening tag, and if
you jump it will jump to that opening tag. Similarly, if you place the
caret next to the < or tag name of an opening tag, it will jump to the
closing tag.

Change-Id: Id25487b24616abf79c71de5eec21f8c0f07e68cc

12 years agosdkman2: if nothing selected yet, select new/updates.
Raphael Moll [Thu, 7 Jul 2011 15:14:23 +0000 (11:14 -0400)]
sdkman2: if nothing selected yet, select new/updates.

Also synchronize selection between the sort-by-api
and the sort-by-source mode.

Updated with unit tests.

Change-Id: I714953dee219bc7a5471a347571262459f6052de

12 years agoImprove smart-indent handling in XML files
Tor Norbye [Tue, 2 Aug 2011 21:13:47 +0000 (14:13 -0700)]
Improve smart-indent handling in XML files

This changeset adds a new "auto edit strategy" for Android XML files,
which replaces the default XML auto-indenter (which just copied the
indentation of the previous line.)

The new indenter instead uses the lexical information to indent based
on the tag and bracket balance.

For example, if the | represents the caret position, then the
following shows how the edits are transformed:

    <foo name="value"/>|       =>       <foo name="value"/>
                                        |

    <foo name="value">|        =>       <foo name="value">
                                            |

    <foo                                <foo
        attr1 = "value1"|>     =>           attr1 = "value1"
                                            |>

    <foo                                <foo
        attr1 = "value1"/>|    =>           attr1 = "value1"/>
                                        |

It can also modify the text after the caret, as in the following
transformation:

    <foo>|</foo>               =>       <foo>
                                            |
                                        </foo>

See the unit test for more cases.

Change-Id: Ia99ecf6573ff4a9473970aa2fd481d2228ddf45d

12 years agoMerge "Use Windows line delimiters on Windows"
Tor Norbye [Wed, 3 Aug 2011 18:25:15 +0000 (11:25 -0700)]
Merge "Use Windows line delimiters on Windows"

12 years agoMerge "Update tools/ADT to rev 14."
Xavier Ducrohet [Wed, 3 Aug 2011 18:04:38 +0000 (11:04 -0700)]
Merge "Update tools/ADT to rev 14."

12 years agoMerge "Fix magnetic field sensor string."
David Turner [Wed, 3 Aug 2011 12:20:05 +0000 (05:20 -0700)]
Merge "Fix magnetic field sensor string."

12 years agoUpdate tools/ADT to rev 14.
Xavier Ducrohet [Wed, 3 Aug 2011 01:20:38 +0000 (18:20 -0700)]
Update tools/ADT to rev 14.

Change-Id: Id29498fde61185a63812b7267b64560a8fd54dc5

12 years agoMerge "SDK Man2: Fix initial load of all sources."
Raphael Moll [Tue, 2 Aug 2011 22:11:14 +0000 (15:11 -0700)]
Merge "SDK Man2: Fix initial load of all sources."

12 years agoMerge "Add a new XML formatter, new options, and format on save"
Tor Norbye [Tue, 2 Aug 2011 21:43:03 +0000 (14:43 -0700)]
Merge "Add a new XML formatter, new options, and format on save"

12 years agoUse Windows line delimiters on Windows
Tor Norbye [Tue, 2 Aug 2011 21:41:07 +0000 (14:41 -0700)]
Use Windows line delimiters on Windows

Change-Id: I33094888432214fc5c70c4c4392d8afd932a3a7a

12 years agoMerge "Add clipart support to the asset set wizard"
Tor Norbye [Tue, 2 Aug 2011 21:25:29 +0000 (14:25 -0700)]
Merge "Add clipart support to the asset set wizard"

12 years agoAdd clipart support to the asset set wizard
Tor Norbye [Fri, 29 Jul 2011 02:33:36 +0000 (19:33 -0700)]
Add clipart support to the asset set wizard

This changeset adds clipart support to the asset set wizard. There is
only one placeholder clipart image now but the code reads the
available images from the jar dynamically.

This changeset also adds "file exists - replace yes, no, always,
never" handling for the generated icons.

Change-Id: I38d0c40957eff4a9e844e29d61f2c57493bd10f0

12 years agoSDK Man2: Fix initial load of all sources.
Raphael Moll [Tue, 2 Aug 2011 21:10:38 +0000 (14:10 -0700)]
SDK Man2: Fix initial load of all sources.

Change-Id: I54598804adad6b21ba524829570d28135f0586ca

12 years agoMerge "Fix ADT on Windows: don't use private FontData fields."
Raphael Moll [Tue, 2 Aug 2011 20:39:17 +0000 (13:39 -0700)]
Merge "Fix ADT on Windows: don't use private FontData fields."

12 years agoFix ADT on Windows: don't use private FontData fields.
Raphael Moll [Tue, 2 Aug 2011 20:17:27 +0000 (13:17 -0700)]
Fix ADT on Windows: don't use private FontData fields.

Most FontData fields must NOT be accessed directly
as they are platform-dependent.

Change-Id: I26ad9b40b9d2040931551c6f08fa033ef3c24386

12 years agoMerge "ADT Resource Repo stores IDs and Called Once"
Josiah Gaskin [Tue, 2 Aug 2011 20:02:07 +0000 (13:02 -0700)]
Merge "ADT Resource Repo stores IDs and Called Once"

12 years agoAdd a new XML formatter, new options, and format on save
Tor Norbye [Fri, 29 Jul 2011 20:04:31 +0000 (13:04 -0700)]
Add a new XML formatter, new options, and format on save

This changeset adds a custom XML formatter for the Android XML
editors.

There is an option for turning off this formatter and using the
standard XML formatter instead.

The new custom formatter offers the following features:

* By default, it formats files following the Android conventions for
  XML formatting. This means not only that it indents with 4 space
  characters (instead of the Eclipse default of one tab character),
  but it places attributes on a line of their own, it adds blank
  lines in certain places, and so on.

* It sorts attributes (logically, alphabetically, or none)

* It formats files with different styles depending on the context.
  For example, in layout files it always places a single blank line
  between view elements, whereas in manifest files it only places
  blank lines between elements of different types such that for
  example the <uses-permission> elements all form a logical group,
  separated from <uses-sdk> and so on.

  The fact that strings.xml and layout.xml are usually formatted with
  different flavors is one of the reasons setting up the old Eclipse
  XML formatter to do the right thing was not possible.

In addition, there are various user options added to the Editors
preference page where you can tweak the behavior of the formatter,
such as turning off blank lines completely, controlling whether there
is a space before the > or /> closing characters, and you can also
tell the formatter to use Eclipse's indentation setting (indentation
size and whether to use spaces or tabs).

Finally, there is a new "Format on Save" option which behaves just
like Format on Save for Java files: when you press Ctrl-S to save a
file, the XML content will be formatted before the file is saved.

Change-Id: Ic6f05c768ab063b09f6f0248f60fbe8722fb149d

12 years agoADT Resource Repo stores IDs and Called Once
Josiah Gaskin [Mon, 18 Jul 2011 23:54:43 +0000 (16:54 -0700)]
ADT Resource Repo stores IDs and Called Once

This change makes ADT parse out @+id declarations from layout and
menu files and store them in its ResourceRepository. This eliminates
the need to merge in IDs from the generated R.java in order to have
a complete repository of resources.

In order to do this, a new type of ResourceFile is created:
IdGeneratingResourceFile which is used for xml files in menu/ and layout/.
Also includes an IdResourceParser which finds all the declared IDs in an XML.

This change also includes a change to the ResourceMananger to process
raw deltas that can be provided either from the PreCompilerBuilder or from
the GlobalProjectManager. This is to avoid duplicate deltas being passed
to ResourceManager when autobuilding.

Change-Id: I1c705a5f5a01ce7daa3eb76f14bd6cb9e11b5248

12 years agoMerge "New plug-in supporting NDK with CDT"
Xavier Ducrohet [Mon, 1 Aug 2011 23:15:46 +0000 (16:15 -0700)]
Merge "New plug-in supporting NDK with CDT"

12 years agoMerge "SDK Manager2 revamp of package display"
Raphael Moll [Mon, 1 Aug 2011 21:10:26 +0000 (14:10 -0700)]
Merge "SDK Manager2 revamp of package display"

12 years agoMerge "SDK Manager: Fix display of Archive sizes."
Raphael Moll [Mon, 1 Aug 2011 21:10:20 +0000 (14:10 -0700)]
Merge "SDK Manager: Fix display of Archive sizes."

12 years agoSDK Manager2 revamp of package display
Raphael Moll [Fri, 29 Jul 2011 23:57:33 +0000 (16:57 -0700)]
SDK Manager2 revamp of package display

Always compute the sort-by-api and the sort-by-source
lists together. This allows the UI to change the display
whilst the underlying packages are being updated.

Change-Id: I6dc551bc27afa1b81bb4a26c236d8fcf5d910884

12 years agoSDK Manager: Fix display of Archive sizes.
Raphael Moll [Fri, 29 Jul 2011 22:57:14 +0000 (15:57 -0700)]
SDK Manager: Fix display of Archive sizes.

SDK Issue: 18875

Change-Id: I702e11cff07bded8e90d415541040fc06ceb7d49

12 years agoMerge "Make SDK Manager2 window app-modal."
Raphael Moll [Fri, 29 Jul 2011 20:50:34 +0000 (13:50 -0700)]
Merge "Make SDK Manager2 window app-modal."

12 years agoMake SDK Manager2 window app-modal.
Raphael Moll [Fri, 29 Jul 2011 19:49:38 +0000 (12:49 -0700)]
Make SDK Manager2 window app-modal.

SDK Bug: 5097338

Change-Id: I3969ac6920e70513723a6fb917be520b59ebd7f1

12 years agoMerge "Add Java Quick Assistant for Extracting Strings"
Tor Norbye [Fri, 29 Jul 2011 20:17:10 +0000 (13:17 -0700)]
Merge "Add Java Quick Assistant for Extracting Strings"

12 years agoAdd Java Quick Assistant for Extracting Strings
Tor Norbye [Thu, 28 Jul 2011 21:07:18 +0000 (14:07 -0700)]
Add Java Quick Assistant for Extracting Strings

This changeset adds a Quick Assistant to Java files in Android
projects, which proposes "Extract String" when the caret is within a
String literal.

It also moves a couple of utility methods from the Hyperlinks class to
the AdtUtils class.

Change-Id: Ica5ff40e32e3e145481d6c895178109289ed1d9b

12 years agoMerge "Add text support to asset studio wizard"
Tor Norbye [Fri, 29 Jul 2011 19:17:44 +0000 (12:17 -0700)]
Merge "Add text support to asset studio wizard"

12 years agoMerge "Add tooltip drag feedback for relative layout"
Tor Norbye [Fri, 29 Jul 2011 19:16:49 +0000 (12:16 -0700)]
Merge "Add tooltip drag feedback for relative layout"

12 years agoMerge "Back out quick-outline customization: Requires Eclipse 3.6"
Tor Norbye [Fri, 29 Jul 2011 19:15:11 +0000 (12:15 -0700)]
Merge "Back out quick-outline customization: Requires Eclipse 3.6"

12 years agoBack out quick-outline customization: Requires Eclipse 3.6
Tor Norbye [Fri, 29 Jul 2011 19:13:50 +0000 (12:13 -0700)]
Back out quick-outline customization: Requires Eclipse 3.6

Change-Id: I7c529c81dd53c8ff0ad12ada78de2961910aa336

12 years agoMerge "Customize Quick Outline for Layout and Resource editors"
Tor Norbye [Fri, 29 Jul 2011 19:10:23 +0000 (12:10 -0700)]
Merge "Customize Quick Outline for Layout and Resource editors"

12 years agoCustomize Quick Outline for Layout and Resource editors
Tor Norbye [Fri, 29 Jul 2011 18:48:40 +0000 (11:48 -0700)]
Customize Quick Outline for Layout and Resource editors

The XML editor has a Quick Outline (Cmd-O) but it only displays the
tag name. This means that you only see "Button" instead of ids to
distinguish similar widgets - and it also means that you can't filter
based on the ids or names.

This changeset adds a custom configuration for the XML quick outline
used by the layout editor and the resource editor which includes the
id or name attributes, and it also picks up the palette icons for the
various widgets.

Change-Id: I08e5d8d10f8f2ad0c2633488d3520d48da6c20cb

12 years agoMerge "Style: space after synchronized (object) {...}"
Raphael Moll [Fri, 29 Jul 2011 18:26:51 +0000 (11:26 -0700)]
Merge "Style: space after synchronized (object) {...}"

12 years agoMerge "SDK Manager2: Revamp progress bar handling."
Raphael Moll [Fri, 29 Jul 2011 18:26:16 +0000 (11:26 -0700)]
Merge "SDK Manager2: Revamp progress bar handling."

12 years agoAdd text support to asset studio wizard
Tor Norbye [Thu, 28 Jul 2011 22:18:33 +0000 (15:18 -0700)]
Add text support to asset studio wizard

Change-Id: I91fe21d73d642c1c5931ad346c7db7534a05262c

12 years agoMerge "Add a text rendering utility class to the Asset Studio library."
Tor Norbye [Thu, 28 Jul 2011 23:33:14 +0000 (16:33 -0700)]
Merge "Add a text rendering utility class to the Asset Studio library."

12 years agoAdd a text rendering utility class to the Asset Studio library.
Roman Nurik [Thu, 28 Jul 2011 06:39:32 +0000 (23:39 -0700)]
Add a text rendering utility class to the Asset Studio library.

Add a text rendering utility class to the Asset Studio library. Also
fix a tiny edge-case bug in image scaling. The text rendering class
allows rendering a String with some options to a BufferedImage, for
input as the sourceImage to a GraphicGenerator.

Change-Id: I8e17e9a25ac2e48fa55e2994706aeb572da54223

12 years agoAdd tooltip drag feedback for relative layout
Tor Norbye [Tue, 12 Jul 2011 21:21:08 +0000 (14:21 -0700)]
Add tooltip drag feedback for relative layout

This changeset adds tooltip drag feedback for RelativeLayout. During
dragging, the matched edge can quickly change from the left side to
the right side or the top to the bottom edge, so the tooltip support
now allows a client to specify where to align the tooltip not just at
creation but also during updates. This is particularly important for
RelativeLayout where we need to ensure that the tooltips do not
obscure the constraint feedback arrows.  And to prevent flicker, it
uses a timer to ensure that there is at least 750 ms between the
repositioning of the tooltip (but it will apply a side change
immediately if it has been 750 ms since the last time the alignment
changed).

Change-Id: I8817db67844ad13c651d343ad310d8646e34dfca

12 years agoMerge "Allow GridLayout to exist in project packages"
Tor Norbye [Wed, 27 Jul 2011 23:51:06 +0000 (16:51 -0700)]
Merge "Allow GridLayout to exist in project packages"

12 years agoAllow GridLayout to exist in project packages
Tor Norbye [Fri, 15 Jul 2011 20:04:29 +0000 (13:04 -0700)]
Allow GridLayout to exist in project packages

Change-Id: Ia455a9c9de853dcc0e5152a8b24a09192c39b3b4

12 years agoMerge "18623: Adding ImageView in xml file causes crash of Eclipse"
Tor Norbye [Wed, 27 Jul 2011 23:48:46 +0000 (16:48 -0700)]
Merge "18623: Adding ImageView in xml file causes crash of Eclipse"

12 years agoMerge "Asset Studio wizard"
Tor Norbye [Wed, 27 Jul 2011 23:48:25 +0000 (16:48 -0700)]
Merge "Asset Studio wizard"

12 years agoAsset Studio wizard
Tor Norbye [Sat, 16 Jul 2011 04:16:56 +0000 (21:16 -0700)]
Asset Studio wizard

This is an initial integration of the Android Asset Studio into
Eclipse, as a New Asset wizard. It uses the Java port of the Android
Asset Studio to generate the assets:
  https://code.google.com/a/google.com/p/android-asset-studio-java/
It only supports launcher icons, and some of the configurable
parameters (file, shape, crop).

To run it, put the AssetStudioLib.jar file into the the adt libs
directory.

There's a new "Asset Set" wizard in the New wizard, which will open up
a two page wizard; the first page lets you select the project (which
it attempts to pick up from context), as well as the type of asset to
create, and the asset output name.

In the second page there are the various widgets to tweak the code
generator, and a preview area on the right which updates as you tweak
the various controls.

The main remaining work is to support additional asset types as
they are added to the assetstudio generator library.

Change-Id: I2e556337f8e5c3bc09e84b35a342ba05110abebc

12 years agoStyle: space after synchronized (object) {...}
Raphael Moll [Wed, 27 Jul 2011 23:36:44 +0000 (16:36 -0700)]
Style: space after synchronized (object) {...}

For keywords such as if, for, while, we put a space
between the keyword and the expression. Same should
go for synchronized (object) {}.

Change-Id: I5b145912f9346e3f4d8367865c2729abea68fdbc

12 years agoMerge "Initial commit for the Asset Studio library in the SDK"
Xavier Ducrohet [Wed, 27 Jul 2011 23:31:18 +0000 (16:31 -0700)]
Merge "Initial commit for the Asset Studio library in the SDK"

12 years agoMerge "Fix undo problems in the XML editor (issue #15901)"
Tor Norbye [Wed, 27 Jul 2011 23:15:21 +0000 (16:15 -0700)]
Merge "Fix undo problems in the XML editor (issue #15901)"

12 years agoMerge "Sort XML attributes logically"
Tor Norbye [Wed, 27 Jul 2011 23:15:08 +0000 (16:15 -0700)]
Merge "Sort XML attributes logically"

12 years agoSDK Manager2: Revamp progress bar handling.
Raphael Moll [Wed, 27 Jul 2011 22:12:14 +0000 (15:12 -0700)]
SDK Manager2: Revamp progress bar handling.

Change-Id: Ic5751f5c86f7cd4cf31927d83368a7fcb432e216

12 years agoMerge changes I984ae397,I24f74378
Raphael Moll [Wed, 27 Jul 2011 20:23:08 +0000 (13:23 -0700)]
Merge changes I984ae397,I24f74378

* changes:
  SDK Man2: Clear local source caches when reloading.
  A few minor UI tweaks to SDK Manager 2.

12 years agoMerge "SDK Manager2: revamp package diff logic."
Raphael Moll [Wed, 27 Jul 2011 20:20:25 +0000 (13:20 -0700)]
Merge "SDK Manager2: revamp package diff logic."

12 years agoMerge "Fix code completion handling for text selection"
Tor Norbye [Wed, 27 Jul 2011 17:18:59 +0000 (10:18 -0700)]
Merge "Fix code completion handling for text selection"

12 years agoMerge "Fix 18539: "Extract Android String" mangles the replacement str"
Tor Norbye [Wed, 27 Jul 2011 16:42:51 +0000 (09:42 -0700)]
Merge "Fix 18539: "Extract Android String" mangles the replacement str"

12 years ago18623: Adding ImageView in xml file causes crash of Eclipse
Tor Norbye [Wed, 27 Jul 2011 02:15:32 +0000 (19:15 -0700)]
18623: Adding ImageView in xml file causes crash of Eclipse

Catch exceptions encountered during preview rendering in resource
choosers to ensure that they don't derail the chooser dialog.

Change-Id: I6a0763cea2598b609283d284967c1121b1b18fdb

12 years agoFix 18539: "Extract Android String" mangles the replacement str
Tor Norbye [Wed, 27 Jul 2011 01:44:46 +0000 (18:44 -0700)]
Fix 18539: "Extract Android String" mangles the replacement str

The refactoring could end up processing the current Java file twice -
first using the normal code path, and a second time if the "Replace in
All Java Files" checkbox was checked. This second pass would add a
second set of edits which would mangle the file.

Change-Id: I99ed50ab477af12d7fb54a7de6401689dad5d104

12 years agoFix code completion handling for text selection
Tor Norbye [Wed, 27 Jul 2011 00:43:22 +0000 (17:43 -0700)]
Fix code completion handling for text selection

This CL fixes
18607: ADT 12 problems with xml files

The bug is that if there is a text selection and you invoke code
completion and select an alternative, the wrong number of characters
is deleted as part of the replacement.

The fix is simple: remove the code which adds in the selection count
from the replacement string, since the complete replacement count is
now already computed properly without regard for the selection (we
should -always- replace the complete value token, not just the
selection).

Most of the diffs actually pertain to new unit tests for this because
the testing infrastructure needed some changes to handle references to
selection ranges rather than just caret offsets.

There are also a couple of updates to some test goldenfiles unrelated
to this fix, which updates the golden files to reflect recent changes
like the package name of GestureOverlayViews and the @attr resource
type in completion.

Change-Id: Ie4f680f201930414457a79846f722db6efc89f93

12 years agoSDK Man2: Clear local source caches when reloading.
Raphael Moll [Tue, 26 Jul 2011 17:21:00 +0000 (10:21 -0700)]
SDK Man2: Clear local source caches when reloading.

Change-Id: I984ae397ada014ff8869d5775be1bc779ef22319

12 years agoA few minor UI tweaks to SDK Manager 2.
Raphael Moll [Mon, 25 Jul 2011 22:59:37 +0000 (15:59 -0700)]
A few minor UI tweaks to SDK Manager 2.

- Make the tree filter checkboxes (new, installed, obsolete)
  work again but this time by using a proper TreeViewer filter.
- Fix missing name column icons in the TreeViewer.
- Fix display of obsolete items, trimming the duplicated platform
  name when possible.

Change-Id: I24f743788b01fe8c9c5f9a7f9b301f725e32f666

12 years agoSDK Manager2: revamp package diff logic.
Raphael Moll [Thu, 21 Jul 2011 22:53:43 +0000 (15:53 -0700)]
SDK Manager2: revamp package diff logic.

This revamps the diff algorithm used to merge
the local and remote packages found during a
repository load into the PkgItems displayed in
the tree viewer.

FYI all the Package and Archive sub-classes are getting
an equals() and hashCode() methods to make them behave
correctly when put it in a HashTable or Set. These are
the auto-generated stuff from Eclipse.

Change-Id: I1494a0ed44cd768eed252e3a81b9e74bf86d563c

12 years agoMerge "SDK Man2: New UTs for install/delete cases."
Raphael Moll [Mon, 25 Jul 2011 21:32:36 +0000 (14:32 -0700)]
Merge "SDK Man2: New UTs for install/delete cases."

12 years agoSDK Man2: New UTs for install/delete cases.
Raphael Moll [Wed, 20 Jul 2011 21:36:00 +0000 (14:36 -0700)]
SDK Man2: New UTs for install/delete cases.

Change-Id: I1f1e95592f4946ab61ad512f187f87be60ea5834

12 years agoMerge "Fix possible NPE in prop page if ProjectState is null."
Xavier Ducrohet [Thu, 21 Jul 2011 19:52:13 +0000 (12:52 -0700)]
Merge "Fix possible NPE in prop page if ProjectState is null."

12 years agoMerge "Add support for aapt CrunchCache in ADT and Ant"
Josiah Gaskin [Thu, 21 Jul 2011 16:51:17 +0000 (09:51 -0700)]
Merge "Add support for aapt CrunchCache in ADT and Ant"

12 years agoAdd support for aapt CrunchCache in ADT and Ant
Josiah Gaskin [Tue, 7 Jun 2011 23:06:06 +0000 (16:06 -0700)]
Add support for aapt CrunchCache in ADT and Ant

This change lets ADT and Ant use the crunch cache system
set up in change I58271fb2. This commit is separate because
sdk and framework are separate git repositories.

Change-Id: If2828d157acad0b5adb812001e777c199e3c62fe

12 years agoMerge "Add support to Ant for packaging dependency checks"
Josiah Gaskin [Thu, 21 Jul 2011 16:48:04 +0000 (09:48 -0700)]
Merge "Add support to Ant for packaging dependency checks"

12 years agoFix possible NPE in prop page if ProjectState is null.
Xavier Ducrohet [Thu, 21 Jul 2011 00:24:19 +0000 (17:24 -0700)]
Fix possible NPE in prop page if ProjectState is null.

If default.prop is not present then ProjectState is null,
but the property page is required to set the target (to create
the file)...

Change-Id: I8bb9337476c4de1d20feca946a6f2361dc8c9af3

12 years agoMerge "Fix to avoid NPE in ADT PreCompiler"
Josiah Gaskin [Wed, 20 Jul 2011 23:00:22 +0000 (16:00 -0700)]
Merge "Fix to avoid NPE in ADT PreCompiler"

12 years agoFix to avoid NPE in ADT PreCompiler
Josiah Gaskin [Wed, 20 Jul 2011 22:52:56 +0000 (15:52 -0700)]
Fix to avoid NPE in ADT PreCompiler

This change removes the possibility of throwing an NPE when calling
AAPT from the PreCompilerBuilder.

Change-Id: I521e4088d1f0942e575d6edff91049c78d9c1eb8

12 years agoMerge "SDK Manager 2: incremental sort when sorting by source + UT"
Raphael Moll [Wed, 20 Jul 2011 20:41:23 +0000 (13:41 -0700)]
Merge "SDK Manager 2: incremental sort when sorting by source + UT"

12 years agoMerge "Add support to Ant for dependency checking"
Josiah Gaskin [Wed, 20 Jul 2011 17:14:30 +0000 (10:14 -0700)]
Merge "Add support to Ant for dependency checking"