OSDN Git Service
Tor Norbye [Tue, 11 Jan 2011 03:45:35 +0000 (19:45 -0800)]
Reformat changes.txt
Make the changes.txt wrap such that it's easier to read long lines.
Change-Id: Idc9ce68987d41c53a4e87d2fdc1c23573b0ebc20
Tor Norbye [Tue, 11 Jan 2011 03:20:45 +0000 (19:20 -0800)]
Additions to changes.txt
Change-Id: I5bc76938bffe654f50e35a7b3c7e2aaf8f97f2f8
Tor Norbye [Tue, 11 Jan 2011 03:09:53 +0000 (19:09 -0800)]
Merge "Use ResourceChooser for Strings"
Tor Norbye [Mon, 10 Jan 2011 23:21:26 +0000 (15:21 -0800)]
Use ResourceChooser for Strings
When editing the text property (via "Edit Text..."), show the
ResourceChooser (assigned to ResourceType.STRING) instead of the more
generic ReferenceChooser.
Some minor tweaks to incorporate feedback on an earlier CL.
Change-Id: I935456075910acd59cedbfeb4cb43680038e412d
Jean-Baptiste Queru [Mon, 10 Jan 2011 22:54:11 +0000 (14:54 -0800)]
reconcile standalone tools_r9 into master
Change-Id: I822ae7661ec1a4f2995176bf592c7bbbf83e57bb
Raphael Moll [Mon, 10 Jan 2011 22:39:32 +0000 (14:39 -0800)]
Merge "Update changes.txt."
Tor Norbye [Mon, 10 Jan 2011 22:22:20 +0000 (14:22 -0800)]
Merge "Add "Play Animation" menu"
Tor Norbye [Mon, 10 Jan 2011 22:21:21 +0000 (14:21 -0800)]
Merge "Disallow Java keywords in resource names"
Tor Norbye [Mon, 10 Jan 2011 22:21:05 +0000 (14:21 -0800)]
Merge "Use Reference Chooser rather than String dialog for "Edit Text""
Tor Norbye [Mon, 10 Jan 2011 22:20:47 +0000 (14:20 -0800)]
Merge "Allow blank strings for the text property input"
Raphael Moll [Sat, 8 Jan 2011 06:48:26 +0000 (22:48 -0800)]
Update changes.txt.
Change-Id: Id616f7afd275a218324959ff9d52d1b4529f7cd1
Tor Norbye [Mon, 10 Jan 2011 19:49:21 +0000 (11:49 -0800)]
Disallow Java keywords in resource names
If you create a resource file that is a Java keyword, Bad Stuff
happens - it doesn't even make it into the R file.
This modifiers the resource name validator (used among other places in
the New XML File wizard) to disallow these names along with a suitable
error message.
Change-Id: Ic807bb9194d316f227bf3435509632374113563d
Tor Norbye [Mon, 10 Jan 2011 19:08:52 +0000 (11:08 -0800)]
Add "Play Animation" menu
Adds a new dynamically populated context menu named "Play Animation", which
contains 4 sections:
- First, the most recently played animation name. This is initially
empty, but once you've played an animation, the most recently one is
listed there.
- "Create...". This is a shortcut which opens the "New Android XML
File" wizard, pre-configured to point at the current project and
with the Animation category selected.
- "Android Builtin >". This is a submenu (also lazily populated) which
lists all the builtin Android framework animations alphabetically.
- The animations in the current project, if any, listed
alphabetically.
Selecting any of the project or framework animation names will cause
the animation to be played once. During the animation, selection and
hover overlays are temporarily hidden.
This is just a start; we should play/rewind/stop buttons, maybe a loop
toggle button, etc somewhere on the screen when you've selected an
aniation. We should also try to filter out animations (especially
framework ones) that have no effect on the current selection.
Finally, error messages need to be handled better since we are reusing
the render session from the editor.
Change-Id: If113b02d458972b5cc2cb253dd9e6c312b8302a9
Xavier Ducrohet [Mon, 10 Jan 2011 19:13:30 +0000 (11:13 -0800)]
Merge "More fine grained layoutlib Capability for animation support."
Raphael Moll [Mon, 10 Jan 2011 18:52:22 +0000 (10:52 -0800)]
Merge "Update changes.txt. Do not merge." into tools_r9
Raphael Moll [Mon, 10 Jan 2011 18:52:08 +0000 (10:52 -0800)]
Merge "Merge: Cleanup ArrayList usage in SDK Manager." into tools_r9
Raphael Moll [Mon, 10 Jan 2011 18:52:01 +0000 (10:52 -0800)]
Merge "Merge: SdkManager: suggest which platform to install to fix a broken addon." into tools_r9
Raphael Moll [Mon, 10 Jan 2011 18:51:48 +0000 (10:51 -0800)]
Merge "Merge: Support broken addons in SDK Manager UI." into tools_r9
Raphael Moll [Mon, 10 Jan 2011 18:51:40 +0000 (10:51 -0800)]
Merge "Merge: SDK Manager: specify proxy on no-UI command-line." into tools_r9
Raphaël Moll [Mon, 10 Jan 2011 18:51:32 +0000 (10:51 -0800)]
Merge "Merge: Load and apply proxy settings from config file in UpdateNoWindow, allowing headless updates to work behind a proxy." into tools_r9
Raphaël Moll [Mon, 10 Jan 2011 18:51:22 +0000 (10:51 -0800)]
Merge "Merge: Set 'https' proxy system properties using the 'http' settings, allowing downloads via an HTTPS proxy to work." into tools_r9
Raphael Moll [Mon, 10 Jan 2011 18:51:09 +0000 (10:51 -0800)]
Merge "Merge: Minor method rename in SdkManager UI." into tools_r9
Raphael Moll [Mon, 10 Jan 2011 18:51:02 +0000 (10:51 -0800)]
Merge "Add Pair<,> to SdkLib.utils" into tools_r9
Raphael Moll [Mon, 10 Jan 2011 18:50:48 +0000 (10:50 -0800)]
Merge "Merge: SDK Manager: Rework install logic." into tools_r9
Raphael Moll [Mon, 10 Jan 2011 18:50:36 +0000 (10:50 -0800)]
Merge "Merge: SDK Manager: Split install logic out of the Archive class." into tools_r9
Tor Norbye [Mon, 10 Jan 2011 03:43:23 +0000 (19:43 -0800)]
Use Reference Chooser rather than String dialog for "Edit Text"
Fix 13880: Dialog opened by contextual properties menu item should be
the reference chooser.
Change-Id: I88d994271217c96985a0e18c84efc16a232c2bd4
Xavier Ducrohet [Sun, 9 Jan 2011 22:21:03 +0000 (14:21 -0800)]
More fine grained layoutlib Capability for animation support.
Make the distinction between playing animation, animating
view insert/delete/move inside the same viewgroup and animating
move across layouts.
Change-Id: Ia9a6e4e53425a66a74ddd39796b04ed8c78d4a5a
Raphael Moll [Sat, 8 Jan 2011 06:41:28 +0000 (22:41 -0800)]
Update changes.txt. Do not merge.
Change-Id: Ibab7af837652986a5037c745a0093c6a592274f5
Raphael Moll [Fri, 7 Jan 2011 21:48:13 +0000 (13:48 -0800)]
Merge: Cleanup ArrayList usage in SDK Manager.
Change-Id: Id03b96aa420a0aa83771c60880887577fd8c020e
Raphael Moll [Fri, 7 Jan 2011 08:41:14 +0000 (00:41 -0800)]
Merge: SdkManager: suggest which platform to install to fix a broken addon.
The SDK Manager now has the notion of a "broken installed package".
The BrokenPackage can specify that:
- it requires a certain minimal platform to be installed,
and/or:
- it requires a specific exact platform to be installed.
The later constraint is expressed by IExactApiLevelDependency and
allows UpdaterLogic to find which platform would fix an addon which
is missing its base platform.
Change-Id: I0215900f499014038ba9470b5fcff4c60a24c536
Raphael Moll [Sun, 2 Jan 2011 21:36:40 +0000 (13:36 -0800)]
Merge: Support broken addons in SDK Manager UI.
Change-Id: I21cbd773a941d5b74676d154c42be959497b2f5f
Raphael Moll [Thu, 6 Jan 2011 19:12:53 +0000 (11:12 -0800)]
Merge: SDK Manager: specify proxy on no-UI command-line.
This adds 2 flags to specify the http/https proxy host/port on
the command line when using the console-base "no-ui" SDK update.
The command-line proxy values override settings if defined.
Also revamped the argument help display to support larger
command-line long argument sizes and mandate that arguments
can have one of ther short or long argument name optional.
Change-Id: I013a1e5e9aa8e71f2f3e5f807a0363af86092ac1
Christopher Orr [Wed, 5 Jan 2011 16:38:15 +0000 (17:38 +0100)]
Merge: Load and apply proxy settings from config file in UpdateNoWindow, allowing headless updates to work behind a proxy.
Change-Id: I9d3973ff1e6f17765098670e0cabe852d1352d1f
Christopher Orr [Wed, 5 Jan 2011 16:32:20 +0000 (17:32 +0100)]
Merge: Set 'https' proxy system properties using the 'http' settings, allowing downloads via an HTTPS proxy to work.
Change-Id: Ic2ad4c0b4565c1a7148a7635c3f745b52448b986
Raphael Moll [Fri, 31 Dec 2010 01:18:08 +0000 (17:18 -0800)]
Merge: Minor method rename in SdkManager UI.
Change-Id: I723a97aaff7f67507007806391b494998d99f058
Raphael Moll [Sat, 8 Jan 2011 06:14:50 +0000 (22:14 -0800)]
Add Pair<,> to SdkLib.utils
Needed by following merges from open_master yet
the original Change I5c37e4b4 depends on ADT files
which aren't in tools_r9 yet.
Change-Id: I6434951a1ef5a0fbf4130685fcd007d3b7a3b5fd
Raphael Moll [Wed, 29 Dec 2010 22:57:38 +0000 (14:57 -0800)]
Merge: SDK Manager: Rework install logic.
This should get rid of the annoying behavior on Windows
that prevent the "folder swap" operation due to the folders
being locked. Cf public issue 4410.
High level summary of the issue and the fix: the old behavior
was to unzip in a temp folder, then rename the old folder to
another temp file and finally rename the new folder at the
desired location. This fails typically when there is a file
indexer (e.g. anti-virus) scanning the new folder so we can't
move that folder.
The new logic is to try to move the old folder first into a
temp folder. If the fail move, we have a lock on the old folder
and ask the user to fix it manually. They probably have a file
opened and it's a legit issue to report. Once that succeeded
we can directly unzip the archive into the final destination
without using a temp unzip location, thus avoiding the common
"indexer in progress" issue.
In case the unzip operation fails, we try to copy (not move) the
old folder back.
Change-Id: I4fd862147cf7e0813eeef77a8332c0ce4f97a836
Tor Norbye [Sat, 8 Jan 2011 05:59:18 +0000 (21:59 -0800)]
Allow blank strings for the text property input
The input-dialog for setting the text property was requiring the
string to be non-empty, or it would reject the input. That's not right
- it should be possible to set the text to blank (which is common for
text fields for example), since blank will clear the attribute.
This code was just cut & pasted from the similar code for inputting
id's where the id -should- be nonempty.
The code was also not handling the case where the user cancels the
dialog for custom string properties; we need a null check.
Change-Id: I31a2ae07b99ebc59d15b76f68c514d97294a736b
Raphael Moll [Wed, 29 Dec 2010 04:12:55 +0000 (20:12 -0800)]
Merge: SDK Manager: Split install logic out of the Archive class.
Change-Id: I75a616dfcb957b915f68679dbe3371d7abf2b3bc
Xavier Ducrohet [Fri, 7 Jan 2011 22:14:56 +0000 (14:14 -0800)]
Merge "Fix layout device list."
Raphael Moll [Fri, 7 Jan 2011 21:57:07 +0000 (13:57 -0800)]
Merge "Cleanup ArrayList usage in SDK Manager."
Xavier Ducrohet [Fri, 7 Jan 2011 21:49:49 +0000 (13:49 -0800)]
Fix layout device list.
Change-Id: Idb6b0f654cd11225faceeb5b0541703623a0ee83
Xavier Ducrohet [Fri, 7 Jan 2011 21:48:40 +0000 (13:48 -0800)]
Merge "Remove skins from sdk.git"
Raphael Moll [Fri, 7 Jan 2011 21:48:13 +0000 (13:48 -0800)]
Cleanup ArrayList usage in SDK Manager.
Change-Id: If8e3adec4a23456f5f31be96aa959048a698d225
Raphael Moll [Fri, 7 Jan 2011 08:41:14 +0000 (00:41 -0800)]
SdkManager: suggest which platform to install to fix a broken addon.
The SDK Manager now has the notion of a "broken installed package".
The BrokenPackage can specify that:
- it requires a certain minimal platform to be installed,
and/or:
- it requires a specific exact platform to be installed.
The later constraint is expressed by IExactApiLevelDependency and
allows UpdaterLogic to find which platform would fix an addon which
is missing its base platform.
Change-Id: If429ea39f0ddc19c0cb906bf6766df310de28981
Raphael Moll [Fri, 7 Jan 2011 20:49:23 +0000 (12:49 -0800)]
Merge "SdkManager: suggest which platform to install to fix a broken addon."
Xavier Ducrohet [Fri, 7 Jan 2011 19:37:50 +0000 (11:37 -0800)]
Remove skins from sdk.git
They are now in development.git
Change-Id: I9b8ec2c65892cb7635b6be77a7c8929f62d018b8
Tor Norbye [Fri, 7 Jan 2011 19:37:28 +0000 (11:37 -0800)]
Merge "Fix copyright and clarify silent logger"
Tor Norbye [Fri, 7 Jan 2011 19:26:57 +0000 (11:26 -0800)]
Fix copyright and clarify silent logger
Fix missing header in previous checkin.
Also remove the silent logger from the render() method, and create the
silent logger in the palette preview drag where it's more obvious why
the rendering is quiet.
Change-Id: I80d2be0c40d00589182988262f1d0f2e64ee4dd4
Xavier Ducrohet [Fri, 7 Jan 2011 17:48:52 +0000 (09:48 -0800)]
Merge "Update changelog."
The Android Open Source Project [Fri, 7 Jan 2011 15:16:46 +0000 (07:16 -0800)]
merge from open-source master
Change-Id: Ifc4f16a95242f41faf8b2c37ef5aea8f2b4c14d5
Tor Norbye [Fri, 7 Jan 2011 15:13:23 +0000 (07:13 -0800)]
Merge "Support for editing id, text, string and reference properties"
Tor Norbye [Wed, 5 Jan 2011 22:41:49 +0000 (14:41 -0800)]
Support for editing id, text, string and reference properties
We have context menu items for editing the properties of the currently
selected view, but it is only available for boolean and enumerated
properties.
This changeset makes it possible to edit these properties in three
ways:
1. It adds in all the other properties to the Property context menu,
but instead of pullright menus, the actions have "..." as a suffix,
and when selected will open a dialog asking for the new value.
(This is similar to how custom layout width/height values are
handled.)
If the attribute represents a reference-type, then the Reference
Chooser (also used by the property sheet) is shown, and if not just
a plain text field.
(This context-menu feature was requested by external users.)
2. It adds the "ID" property as a top level item that can be edited
directly via an "Edit ID..." menu item, right next to the "Layout
Width" and "Layout Height" properties which are also special-cased
at the top level.
3. For Views that have a "Text" property, this property is also added
at the top level to be able to set it quickly and conveniently. As
soon as we get inline editing we can consider whether this is still
needed.
In addition, the changeset extracts constants for the various ids used
for action identity, and makes a common function for setting a
particular node attribute.
Change-Id: Ib86a8a5412c39117fe250ce5788d8457a0e3fbe8
The Android Open Source Project [Fri, 7 Jan 2011 15:05:16 +0000 (07:05 -0800)]
merge from open-source master
Change-Id: I9e5cedfe59a747f271cf373f806e5d9ada822b6c
Tor Norbye [Fri, 7 Jan 2011 14:54:39 +0000 (06:54 -0800)]
Merge "Move the "Show Included In" menu item"
Tor Norbye [Wed, 5 Jan 2011 20:24:58 +0000 (12:24 -0800)]
Move the "Show Included In" menu item
The "Show Included In" context menu was grouped as part of the
view-specific actions (setting width, height, orientation,
etc). That's not really a good place since this option is really about
the view as a whole. This changeset moves the item down to the bottom
of the context menu, next to the "Show In" action (which lets you show
the content in another Eclipse view.)
The code was tweaked a bit to be computed lazily (e.g. the contents of
the include list is not computed until the actual Show Included menu
is opened.)
Change-Id: Ic18997271e9ffde491a1a63e337ff015d762a20a
The Android Open Source Project [Fri, 7 Jan 2011 14:42:21 +0000 (06:42 -0800)]
merge from open-source master
Change-Id: I3ff0e78c9ab1596df068921bce7fe92f9a2f9db5
The Android Open Source Project [Fri, 7 Jan 2011 14:29:18 +0000 (06:29 -0800)]
merge from open-source master
Change-Id: Id5239533e7825bd0379b5afb142bb46c8d363f4b
Tor Norbye [Fri, 7 Jan 2011 14:19:46 +0000 (06:19 -0800)]
Merge "Replace Sdk.makeRelativeTo()"
Tor Norbye [Fri, 7 Jan 2011 03:09:06 +0000 (19:09 -0800)]
Replace Sdk.makeRelativeTo()
IPath#makeRelativeTo(IPath) was not supported on Eclipse 3.4, so we
had a local version of it in our sourcebase, as
Sdk#makeRelativeTo(IPath,IPath). However, our version only works
correctly for directories, not plain files, but I had been using it
for files as well.
Now that we no longer need to support Eclipse 3.4, remove our local
version and use the builtin path conversion method.
(Fixed some invalid javadoc too)
Change-Id: I233875e1ecc758eb1ed333686b319b138eb47c4a
Tor Norbye [Fri, 7 Jan 2011 14:14:14 +0000 (06:14 -0800)]
Merge "Accumulate rendering errors and ensure they are always shown"
Tor Norbye [Fri, 7 Jan 2011 04:35:20 +0000 (20:35 -0800)]
Accumulate rendering errors and ensure they are always shown
There are some scenarios where rendering failures (such as an NPE in
the layout lib) will not appear in the error display, and it will not
appear in the Error Log.
In addition, we now get fidelity warnings from the layout library
(warning about Android code using graphics operations not supported by
the layout preview), and these should all be displayed to the user
with a proper explanation.
To solve these problems, this changeset replaces the layout logger
with a new logger which:
(1) Writes all exceptions to the AdtPlug.log(Throwable) method, which
results in the full exception being captured in the Error Log
(2) Accumulates all errors, warnings and fidelity warnings
(3) Provides a summary of ALL the problems at the end, such that they
are all displayed (in decreasing order of severity) for the user
rather than the last one clobbering them all.
The logger also records whether exceptions were logged, and if so, the
last line of the error display indicates that further details can be
found in Window > Show View > Error Log.
Finally, the old logger was a member of the GraphicalEditorPart, but
this is a lightweight object so there is no need to cache it, and in
fact we don't want other types of rendering (such as preview
rendering) popping open the error display area.
Change-Id: Ia00978a725cb7e7ec2dcfbf9e868df2a5136efc0
The Android Open Source Project [Fri, 7 Jan 2011 03:36:29 +0000 (19:36 -0800)]
merge from open-source master
Change-Id: Ifc8965806394560e4dd8da14c1789140998ea51f
Tor Norbye [Fri, 7 Jan 2011 03:27:28 +0000 (19:27 -0800)]
Merge "Fix NON-NLS tokens"
The Android Open Source Project [Fri, 7 Jan 2011 03:23:21 +0000 (19:23 -0800)]
merge from open-source master
Change-Id: Ib519ff7834dfb55894a199ffcfa6f63a6c34764e
Tor Norbye [Fri, 7 Jan 2011 03:19:59 +0000 (19:19 -0800)]
Merge "Improve the Outline contents"
Tor Norbye [Wed, 5 Jan 2011 02:28:43 +0000 (18:28 -0800)]
Improve the Outline contents
1. Make the outline use StyledStrings such that we can use different
colors for different elements in the outline. Use the decorations
color for the element type that follows the id.
2. For elements that define a "text" property, include the text (or a
prefix of it if it is long) in the outline. Thus, for a Button you
might see something like "Button01 - "Submit Order").
3. For elements that define a "src" property, show the
source. Therefore, for an ImageView you might see "ImageView - logo".
4. For <include> elements, show the name of the included layout.
Change-Id: Ibd4c8339ea0e03c969ccaec1a67bc64436ed67af
Xavier Ducrohet [Fri, 7 Jan 2011 02:02:13 +0000 (18:02 -0800)]
Update changelog.
Change-Id: I8ac24138cbf8bfc6d9dd44aaa1fde4d8485d8416
The Android Open Source Project [Fri, 7 Jan 2011 01:01:25 +0000 (17:01 -0800)]
merge from open-source master
Change-Id: I570f71a2e5550a8f1558f9fc83b4ee1321e703a6
Raphael Moll [Fri, 7 Jan 2011 00:51:53 +0000 (16:51 -0800)]
Merge "Support broken addons in SDK Manager UI."
Tor Norbye [Fri, 7 Jan 2011 00:49:10 +0000 (16:49 -0800)]
Merge "Add "Extract As Include" refactoring"
Tor Norbye [Tue, 4 Jan 2011 05:35:41 +0000 (21:35 -0800)]
Add "Extract As Include" refactoring
Add an "Extract As Include" action to the context menu which lets you
extract a set of selected views and move them into a separate layout
file of their own, and insert an <include> reference to the new view
in place.
You can select multiple items as well (provided they are adjacent
siblings) and in that case the newly extracted layout will use the
<merge> tag as the root element.
This changeset also adds a name validator for resource names, used
both in the new-name entry field for extracted include layouts, as
well as in the New XML File wizard. It enforces that the name (except
for the .xml suffix) is a valid Java identifier name (since otherwise
the R file will have compilation errors.)
This changeset also extracts various inlined String constants like
"xmlns", "android" (as used in namespace prefixes), "@id/" etc and
replaces them with constants.
Change-Id: I3eca8b6afd23f22ca9299ff22c614b4ffd3299bf
Raphael Moll [Sun, 2 Jan 2011 21:36:40 +0000 (13:36 -0800)]
Support broken addons in SDK Manager UI.
Change-Id: Idec7365e440e865a8225ed6f0c9c156206141d73
The Android Open Source Project [Thu, 6 Jan 2011 23:18:41 +0000 (15:18 -0800)]
merge from open-source master
Change-Id: Ib4cf580d21187f0b40507eb489ad5ec973d740d8
Raphael Moll [Thu, 6 Jan 2011 23:16:05 +0000 (15:16 -0800)]
Merge "SDK Manager: specify proxy on no-UI command-line."
Raphael Moll [Thu, 6 Jan 2011 19:12:53 +0000 (11:12 -0800)]
SDK Manager: specify proxy on no-UI command-line.
This adds 2 flags to specify the http/https proxy host/port on
the command line when using the console-base "no-ui" SDK update.
The command-line proxy values override settings if defined.
Also revamped the argument help display to support larger
command-line long argument sizes and mandate that arguments
can have one of ther short or long argument name optional.
Change-Id: I87cc535ab369602a5c02c7a938b0e4f4736c0040
The Android Open Source Project [Thu, 6 Jan 2011 22:11:48 +0000 (14:11 -0800)]
merge from open-source master
Change-Id: I840be1659f7c6230a550c6ace00aae4c23b574be
Tor Norbye [Thu, 6 Jan 2011 22:03:40 +0000 (14:03 -0800)]
Merge "Support for included and merged views"
Tor Norbye [Wed, 22 Dec 2010 23:44:00 +0000 (15:44 -0800)]
Support for included and merged views
We have support in the layout library for handling included views
where the include tag is associated with the root elements rendered in
that included view.
However, there are various scenarios where this is not adequate:
1) including <merge> views (see issue 13288)
2) older layout libraries
This changeset fixes the above scenarios, as well as an additional
scenario (where rendering included content in an outer layout did not
work properly if the included elements were not at the root level).
It does this by moving the CanvasViewInfo construction into a set of
factory methods which handle various different hierarchy types of
ViewInfos. ViewInfos with null keys at the top are handled one way;
ViewInfo subtrees that introduce null keys further down are handled
another, and it attempts to match up elements in the UiViewElementNode
hierarchy with ViewInfo objects. If it cannot match them one to one,
it will create a single "bounding box" view containing all unmatched
ViewInfos. This will for example produce a single box out of included
<merge> views.
This changeset also handles multiple includes. The "overlay mask"
could earlier only handle a single include whereas the rewritten code
can handle multiple "holes" in the mask by computing the set of
subrectangles remaining after punching out the include holes.
Change-Id: I163413c7fc301f25c4523b0ee03690f983a05322
The Android Open Source Project [Thu, 6 Jan 2011 18:17:47 +0000 (10:17 -0800)]
merge from open-source master
Change-Id: Iaa3a08abf878cba80952bd087860896e221820ee
Raphaël Moll [Thu, 6 Jan 2011 18:10:39 +0000 (10:10 -0800)]
Merge "Load and apply proxy settings from config file in UpdateNoWindow, allowing headless updates to work behind a proxy."
Raphaël Moll [Thu, 6 Jan 2011 18:10:27 +0000 (10:10 -0800)]
Merge "Set 'https' proxy system properties using the 'http' settings, allowing downloads via an HTTPS proxy to work."
The Android Open Source Project [Thu, 6 Jan 2011 17:39:58 +0000 (09:39 -0800)]
merge from open-source master
Change-Id: I2ef5cfe972c68a8579b23d2f6960bf4456e1b06f
Xavier Ducrohet [Thu, 6 Jan 2011 17:38:34 +0000 (09:38 -0800)]
Merge "For title bar refresh when changing layout file in same editor."
Xavier Ducrohet [Tue, 4 Jan 2011 14:38:45 +0000 (06:38 -0800)]
For title bar refresh when changing layout file in same editor.
Bug: http://code.google.com/p/android/issues/detail?id=13230
Change-Id: Ib9211a2512a47ba87f1ceceb97c86a47579a8872
Xavier Ducrohet [Thu, 6 Jan 2011 17:37:15 +0000 (09:37 -0800)]
Merge "Fix NPE in layout lib legacy conversion for empty layouts."
Xavier Ducrohet [Thu, 6 Jan 2011 17:37:11 +0000 (09:37 -0800)]
Merge "Add log to layout lib init method."
Christopher Orr [Wed, 5 Jan 2011 16:38:15 +0000 (17:38 +0100)]
Load and apply proxy settings from config file in UpdateNoWindow, allowing headless updates to work behind a proxy.
Change-Id: I0deb8981c5fec0c7ae3eddbbde529537c02fdc1c
Christopher Orr [Wed, 5 Jan 2011 16:32:20 +0000 (17:32 +0100)]
Set 'https' proxy system properties using the 'http' settings, allowing downloads via an HTTPS proxy to work.
Change-Id: I95fd0f377df4ff4372e8a7ca18cfc4195bbfc177
Tor Norbye [Tue, 4 Jan 2011 23:59:49 +0000 (15:59 -0800)]
Fix NON-NLS tokens
There were a number of // $NON-NLS-1$ references in the codebase.
Eclipse's "Externalize Strings" functionality will not handle these
correctly; there must not be a space between the "//" and the "$NON"
tokens.
(I left AndroidXmlEditor.xml alone; it is the file I discovered
the problem in but I fixed those references as part of another
pending checkin.)
Change-Id: If185c88a667273af614f0bee5959fd2618756c05
The Android Open Source Project [Tue, 4 Jan 2011 17:49:31 +0000 (09:49 -0800)]
merge from open-source master
Change-Id: I4c8dd41a68077f3ea1787bcd7c73ed0c40fe4d28
Tor Norbye [Tue, 4 Jan 2011 17:38:09 +0000 (09:38 -0800)]
Merge "New XML Wizard fixes"
The Android Open Source Project [Tue, 4 Jan 2011 11:56:28 +0000 (03:56 -0800)]
merge from open-source master
Change-Id: Ic384d9d566a27ded89107ed3ae938dbd5564f987
Xavier Ducrohet [Tue, 4 Jan 2011 11:49:02 +0000 (03:49 -0800)]
Merge "use UTF-8 instead of ISO-8859-1"
Xavier Ducrohet [Tue, 4 Jan 2011 11:29:48 +0000 (03:29 -0800)]
Fix NPE in layout lib legacy conversion for empty layouts.
Change-Id: I23a87efb586d02d571118a6f9e49628fc850d8cb
The Android Open Source Project [Tue, 4 Jan 2011 06:17:55 +0000 (22:17 -0800)]
merge from open-source master
Change-Id: I437e96e500a433b846ca09148970e2e16738b0d8
Raphael Moll [Tue, 4 Jan 2011 06:08:41 +0000 (22:08 -0800)]
Merge "Minor method rename in SdkManager UI."
Raphael Moll [Fri, 31 Dec 2010 01:18:08 +0000 (17:18 -0800)]
Minor method rename in SdkManager UI.
Change-Id: I35447fe1ae9a21763207a07c0e205c1808f3b420
Raphael Moll [Tue, 4 Jan 2011 06:05:34 +0000 (22:05 -0800)]
Merge "Move Pair<,> from ADT to SdkLib.utils"
Raphael Moll [Fri, 31 Dec 2010 01:14:56 +0000 (17:14 -0800)]
Move Pair<,> from ADT to SdkLib.utils
Change-Id: I5c37e4b4dd83bc239ed242709ede70982f14705f