OSDN Git Service
Tor Norbye [Fri, 14 Jan 2011 00:18:11 +0000 (16:18 -0800)]
Use LayoutLog.TAG_RESOURCES_PREFIX
Change-Id: I17f9030debd05cd4a8c3e17c3656e4b5eeec3b00
Xavier Ducrohet [Fri, 14 Jan 2011 00:12:34 +0000 (16:12 -0800)]
Merge "Add prefix constants for LayoutLog tags." into tools_r9
Tor Norbye [Thu, 13 Jan 2011 23:22:19 +0000 (15:22 -0800)]
Merge "Warn user about compilation errors causing rendering failures" into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 22:52:52 +0000 (14:52 -0800)]
Add prefix constants for LayoutLog tags.
Some tags have "categories", for instance "resources.resolve"
I created a new constant that contains "resources."
Change-Id: Ifda535b3378021a275e73d988bcf5707e9ab39ff
Xavier Ducrohet [Thu, 13 Jan 2011 21:45:23 +0000 (13:45 -0800)]
Merge "Add Layoutlib log tag constants to LayoutLog" into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 18:40:09 +0000 (10:40 -0800)]
Add Layoutlib log tag constants to LayoutLog
Change-Id: Idf50886132913728c40c23026c1b55172015904b
Tor Norbye [Wed, 12 Jan 2011 02:52:29 +0000 (18:52 -0800)]
Warn user about compilation errors causing rendering failures
If you have certain types of errors in your project, then rendering
will fail with messages that may be confusing.
This changeset attempts to identify some of these common scenarios and
offer detailed explanations to guide the user in the right direction.
Specifically:
1. If the project contains aapt errors (which means aapt did not run
successfully), AND the rendering failed with an error related to
resource lookup, then begin the render error message with an
explanation in bold that this project contains resource errors that
could explain the below rendering errors, and to investigate those
resource errors first.
2. If the project contains javac errors, AND the rendering failed
after the custom project class loader has been consulted, then
display a message stating that compilation errors could have
caused the failure and to investigate those errors first.
3. If a custom view is loaded, and it does not provide a 2- or 3-
argument constructor (which takes an AttributeSet), emit a warning
that XML attributes on the view will not work.
In addition, this changeset cleans up a few other related things:
- Tags are no longer displayed as part of the error message; these are
intended for internal checking only (for example to identify
resource errors from other errors)
- The error display text can now show a vertical scrollbar if the text
is longer than the available space.
- The code which marks the project class loader as used is marked used
as soon as it's asked to resolve a class name, rather than at the
completion of a successful load, since we want to know about failing
custom classes as well.
Change-Id: Ib37a329eed44719ecf741b96ff96747ec4f92ad0
Xavier Ducrohet [Thu, 13 Jan 2011 18:11:53 +0000 (10:11 -0800)]
Merge "Misc fix in ProjectCallback." into tools_r9
Tor Norbye [Thu, 13 Jan 2011 05:08:27 +0000 (21:08 -0800)]
Merge "Remove <merge> from the palette" into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 04:37:32 +0000 (20:37 -0800)]
Misc fix in ProjectCallback.
Change-Id: I35098d93f54c27c5488e1119fe8dab75492c6899
Xavier Ducrohet [Thu, 13 Jan 2011 02:33:31 +0000 (18:33 -0800)]
Merge "Fix MockLog to build on 1.5" into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 02:32:03 +0000 (18:32 -0800)]
Fix MockLog to build on 1.5
Change-Id: Icbdbbae2fe105af6eb1cdb1490a2415007262980
Xavier Ducrohet [Thu, 13 Jan 2011 01:49:55 +0000 (17:49 -0800)]
Merge "Merge
74f725db from master: Add snapshot handling for AVD creation, details, and launch" into tools_r9
Tim Baverstock [Tue, 30 Nov 2010 11:56:04 +0000 (11:56 +0000)]
Merge
74f725db from master: Add snapshot handling for AVD creation, details, and launch
Also respect 'Wipe User Data' by disabling snapshot launch, and support 'Edit AVD'.
Change-Id: I2fee9361d78d70b80314523e36b48fbd80b03ca7
Xavier Ducrohet [Thu, 13 Jan 2011 01:29:59 +0000 (17:29 -0800)]
Merge "New layoutlib API: getViewParent and getViewIndex" into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 00:54:26 +0000 (16:54 -0800)]
Merge "Properly select dock/night mode combo when opening a layout." into tools_r9
Xavier Ducrohet [Thu, 13 Jan 2011 00:21:58 +0000 (16:21 -0800)]
New layoutlib API: getViewParent and getViewIndex
Change-Id: I201e42a9a7e31fcef8b7a0c5b91a6abd5d5407bd
Raphael Moll [Wed, 12 Jan 2011 23:30:46 +0000 (15:30 -0800)]
Merge changes Ide9952df,I70fb1a71 into tools_r9
* changes:
Cleanup warnings in the form-based UI editor.
Make it possible to override the SDK path using an env var
Raphael Moll [Wed, 12 Jan 2011 23:22:42 +0000 (15:22 -0800)]
Cleanup warnings in the form-based UI editor.
Change-Id: Ide9952dfefeb86e59d4ed5b1db25150625a54143
Raphael Moll [Wed, 12 Jan 2011 21:54:53 +0000 (13:54 -0800)]
Make it possible to override the SDK path using an env var
The value will only be used if it matches an existing directory.
Useful for testing from Eclipse.
Note: this is a hack that does not change the preferences, so if the user
looks at Window > Preferences > Android, the path will be the preferences
one and not the overriden one.
Change-Id: I70fb1a7117f56d4c6e5cab253c3323480605413f
Tor Norbye [Wed, 12 Jan 2011 22:38:42 +0000 (14:38 -0800)]
Remove <merge> from the palette
The <include> tag is already removed from the palette. This changeset
does the same thing for the similar <merge> tag, since it does not
work; you cannot drag a <merge> tag somewhere into an existing layout.
(The common case of rendering views with <merge> as the root -does-
work, but that does not involve the palette.)
Change-Id: I9210e196ab66fe77b1303e756384844fde1d1c0f
Xavier Ducrohet [Wed, 12 Jan 2011 21:42:05 +0000 (13:42 -0800)]
Properly select dock/night mode combo when opening a layout.
Change-Id: I3c4f8b875f263970e4c8fc308b466ae14c69c438
Xavier Ducrohet [Wed, 12 Jan 2011 21:42:51 +0000 (13:42 -0800)]
Merge "Resource parser should strip unescaped " from string values." into tools_r9
Xavier Ducrohet [Wed, 12 Jan 2011 18:35:19 +0000 (10:35 -0800)]
Resource parser should strip unescaped " from string values.
Change-Id: I15cc5becdf139a7eeb01309d0d903a35ba773ed9
Xavier Ducrohet [Wed, 12 Jan 2011 03:14:38 +0000 (19:14 -0800)]
Merge "Choose a good locale when opening a file for the first time." into tools_r9
Xavier Ducrohet [Wed, 12 Jan 2011 02:57:05 +0000 (18:57 -0800)]
Choose a good locale when opening a file for the first time.
Because the selection of the full config to use for display
is complicated (due to having to find something that matches
the configuration of the edited file), this is a bit more
complex than simply changing the select in updateLocales().
In fact the selection made there when there is no stored config
is pointless. Instead it's decided later by findAndSetCompatibleConfig
which find the proper combination of device and locale*
* this is actually broken since we added the nightmode and dock mode.
We need to include those in the list of config we try out. I'll fix
this in a later patch.
Change-Id: I83599dc7f0d1a921f9568b6de5c065ca1e82e103
Tor Norbye [Wed, 12 Jan 2011 02:19:09 +0000 (18:19 -0800)]
Merge "Reorder animation submenu" into tools_r9
Tor Norbye [Wed, 12 Jan 2011 02:05:57 +0000 (18:05 -0800)]
Reorder animation submenu
List local animations first, followed by the Create button, followed
by the frameworks animation submenu. Also drop the recent-item.
Change-Id: I238ab85f319383c138ce8e63fd19c7f97a23ea5e
Xavier Ducrohet [Wed, 12 Jan 2011 01:23:30 +0000 (17:23 -0800)]
Merge "Don't reopen a layout if it's already opened." into tools_r9
Tor Norbye [Wed, 12 Jan 2011 01:21:10 +0000 (17:21 -0800)]
Merge "Use res/animator rather than res/anim for the Play Animation code" into tools_r9
Xavier Ducrohet [Wed, 12 Jan 2011 01:16:56 +0000 (17:16 -0800)]
Don't reopen a layout if it's already opened.
This is for the case where a layout is opened
and Eclipse tell its editor to re-open it because it was
double clicked again in the package explorer due to the
MatchingStrategy having returned true.
Change-Id: I404494b990215bcdff163a382ecb411e2efb9b51
Misc: reorder configs for the WXGA device config.
Tor Norbye [Tue, 11 Jan 2011 22:50:59 +0000 (14:50 -0800)]
Use res/animator rather than res/anim for the Play Animation code
We should be using ResourceType.ANIMATOR rather than ResourceType.ANIM
for the designtime playable animations. Simple tweak to make the
"Create Animation" dialog able to create files into res/animator/,
though this needs to be improved (with proper animator/interpolator
root elements etc).
Change-Id: I70a504fbd946da3ff161f9cf953b878a41886fee
Xavier Ducrohet [Tue, 11 Jan 2011 22:39:28 +0000 (14:39 -0800)]
Merge "This is tools r9 in tools_r9. DO NOT MERGE." into tools_r9
Xavier Ducrohet [Tue, 11 Jan 2011 22:37:48 +0000 (14:37 -0800)]
This is tools r9 in tools_r9. DO NOT MERGE.
Change-Id: I4d6d8cd74abd2cb3b9087ac4f30b761d803e15e3
Tor Norbye [Tue, 11 Jan 2011 22:37:04 +0000 (14:37 -0800)]
Merge "Wrap error text" into tools_r9
Tor Norbye [Tue, 11 Jan 2011 21:36:23 +0000 (13:36 -0800)]
Wrap error text
Wide lines in the error label for rendering errors were not
wrapped. Annoying when you're trying to copy & paste a path out of it
to examine the file in question, etc.
Change-Id: I29b5a8cb25e26dbf8e5a5314bb82c400352e6760
Tor Norbye [Tue, 11 Jan 2011 21:32:49 +0000 (13:32 -0800)]
Merge "Reformat changes.txt" into tools_r9
Xavier Ducrohet [Tue, 11 Jan 2011 21:31:57 +0000 (13:31 -0800)]
Merge "Remove error(tag, throwable) from LayoutLog." into tools_r9
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: I037751470aab172fc486530bad645beb2ed487a2
Tor Norbye [Tue, 11 Jan 2011 21:28:57 +0000 (13:28 -0800)]
Merge "Additions to changes.txt" into tools_r9
Tor Norbye [Tue, 11 Jan 2011 03:20:45 +0000 (19:20 -0800)]
Additions to changes.txt
Change-Id: Ib94abd4c1006a88e3e3db6b9e7e0e528ffb52316
Xavier Ducrohet [Tue, 11 Jan 2011 21:12:23 +0000 (13:12 -0800)]
Remove error(tag, throwable) from LayoutLog.
We should never only log an exception with no associated
message.
Also, I've found several case in the layoutlib where there
is a message in place of the tag.
This new API makes it more clear that there's both a tag and a message
since both are required for error()
Change-Id: I6d5f45c07b1cb8df96311d930170526bb729fae6
Tor Norbye [Tue, 11 Jan 2011 21:03:34 +0000 (13:03 -0800)]
Merge "Changes to widget text and id format" into tools_r9
Tor Norbye [Tue, 11 Jan 2011 01:27:49 +0000 (17:27 -0800)]
Changes to widget text and id format
This changeset changes the default text and id attributes of newly
dropped widgets in the following ways:
1. Use the node class name rather than the id as the initial text. In
other words, the default label for a button is "Button" rather than
"@+id/Button01". This is a more common convention in other GUI
builders, and you typically don't want the actual label to be
"@+id"-something, you want it to be "@string"-something, so the @id
prefix is slightly confusing for beginners.
2. The id uses method name capitalization rather than class name
capitalization, e.g. "checkBox" rather than "CheckBox". This seems
to be the convention I see in handwritten layouts, which makes
sense given that the reference will be compiled to and referenced
as a Java field.
3. In the case of conflicts, don't use a leading 0; in other words,
rather than button01, button02, button03 we have button1, button2,
button3. It's unlikely that the user will have ten or more unnamed
widgets (and if they do the leading zero still isn't needed.) The
code which looks for name conflicts now also performs case
insensitive comparisons.
Change-Id: Ie7f2c5dd8e9852acec2c2e154ee20142b8ece9a6
Tor Norbye [Tue, 11 Jan 2011 20:47:48 +0000 (12:47 -0800)]
Merge "Make the error text participate in select all and copy" into tools_r9
Tor Norbye [Mon, 10 Jan 2011 14:56:18 +0000 (06:56 -0800)]
Make the error text participate in select all and copy
When there are rendering errors, the error messages are listed in a
StyledText widget which opens up at the bottom of the layout editor.
This changeset makes it possible to copy & paste the error message. It
does this by:
- Making the global Select All action operate on the error label when
the error label has focus
- Make the global Copy action operate on the error label if the error
label has selected text (which could have been made selected either
by the Select All action above, or by a manual mouse selection)
Change-Id: Ia7f267737a0d43a54dce8cf6b5f5802aef038881
Xavier Ducrohet [Tue, 11 Jan 2011 18:09:47 +0000 (10:09 -0800)]
Merge "Merge into
f9297748 r9: Handle Animator and Interpolator resources." into tools_r9
Xavier Ducrohet [Tue, 11 Jan 2011 05:45:45 +0000 (21:45 -0800)]
Merge into
f9297748 r9: Handle Animator and Interpolator resources.
Change-Id: I85242fb436e7de99887bd60b320a16a051bddc51
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