OSDN Git Service
The Android Open-Source Project [Mon, 15 Aug 2011 15:14:53 +0000 (08:14 -0700)]
merge from open-source master
Change-Id: I4ae9090396b8297e027a092da2825d96a9782a8e
Siva Velusamy [Mon, 15 Aug 2011 15:09:21 +0000 (08:09 -0700)]
Merge "Always refresh logcat table from UI thread."
The Android Open-Source Project [Mon, 15 Aug 2011 04:26:43 +0000 (21:26 -0700)]
merge from open-source master
Change-Id: I7a4974cf2781bebb2bf9245a235e54aeddea67e9
Raphael Moll [Mon, 15 Aug 2011 04:16:48 +0000 (21:16 -0700)]
Merge "SDK Man2: fix bug when deleting a local package."
The Android Open-Source Project [Fri, 12 Aug 2011 23:03:27 +0000 (16:03 -0700)]
merge from open-source master
Change-Id: Ibc34d3f1606d563a04c9bc069b7fc617d0268989
Raphael Moll [Fri, 12 Aug 2011 22:06:00 +0000 (15:06 -0700)]
SDK Man2: fix bug when deleting a local package.
When deleting a local package, the model was still
retaining the info of the previously installed package
and was thus not offering it again for install.
Also fixes a case where selecting something for
install and then cancelling would trigger an
unecessary list refresh.
Change-Id: I0889e2c19c721325f921d8681a429210f76b490b
Siva Velusamy [Fri, 12 Aug 2011 16:00:53 +0000 (09:00 -0700)]
Always refresh logcat table from UI thread.
Change-Id: I8b11783de412a31baf37fc2d9efb8aafdb73a330
Raphael Moll [Fri, 12 Aug 2011 20:08:53 +0000 (13:08 -0700)]
Merge "Fix SdkLib unit test to not print on stderr."
Raphael Moll [Fri, 12 Aug 2011 20:08:42 +0000 (13:08 -0700)]
Merge "Add-ons do not support codenames."
Raphael Moll [Fri, 12 Aug 2011 18:51:07 +0000 (11:51 -0700)]
Fix SdkLib unit test to not print on stderr.
The SdkLib unit tests had the annoying side effect
of writing an XML schema validation error on stderr.
This patch uses an XML Error Handler to capture the
error and actually test for it too.
Change-Id: I129804c6f9cb4ba3dfc25db4f3313553fb01df63
Raphael Moll [Fri, 12 Aug 2011 17:27:15 +0000 (10:27 -0700)]
Add-ons do not support codenames.
There was a typo in the repository XSD and the addon XSD
that had an optional 'codename' element to the addon type.
Since it's optional and (should have) never beend used,
it's safe to remove it and document why we're removing it
without spinning a new XSD version.
Also added a unit-test to enforce it's invalid to have.
Change-Id: Id3c5725c022d86ac0f46532efe25ac5c000c1af7
The Android Open-Source Project [Fri, 12 Aug 2011 16:56:40 +0000 (09:56 -0700)]
merge from open-source master
Change-Id: I49620094d62dc19bd20d53f625ccc74c65f6ea9a
Raphael Moll [Fri, 12 Aug 2011 16:44:14 +0000 (09:44 -0700)]
Merge "Experimental Java-version of the sdk launcher."
The Android Open-Source Project [Fri, 12 Aug 2011 16:44:08 +0000 (09:44 -0700)]
merge from open-source master
Change-Id: I7c1964056aa065bb20c8ea7258c55462650339f4
The Android Open-Source Project [Fri, 12 Aug 2011 16:31:15 +0000 (09:31 -0700)]
merge from open-source master
Change-Id: Ia97666d5858801869bdd37f77bf5d15b356d9650
Raphael Moll [Fri, 12 Aug 2011 16:28:45 +0000 (09:28 -0700)]
Merge "SdkMan2 Log window tweaks."
Raphael Moll [Fri, 12 Aug 2011 16:28:03 +0000 (09:28 -0700)]
Merge "SDK Manager: don't retry source if http auth canceled by user."
Raphael Moll [Fri, 12 Aug 2011 06:20:31 +0000 (23:20 -0700)]
SdkMan2 Log window tweaks.
- Change the toggle button icon (looks like a little
log sheet, grayed or enabled). This replaces the ugly
blue thingy.
- Add support for tooltips to the toggle button widget.
- When logging an error, auto-raise the log window. This
was done using a crude hack in the first version by
having the window raise itself. Now this is more properly
done by having the controller (i.e. the SDK Main Windows)
raise it when it detects an error in the log. This way it
can properly adjust the toggle button state.
Change-Id: I4a444651da4ba3b9022484344b526d8a1b3be3c3
Raphael Moll [Fri, 12 Aug 2011 00:28:12 +0000 (17:28 -0700)]
SDK Manager: don't retry source if http auth canceled by user.
This fixes a minor workflow issue the case of an
SDK source using a Basic HTTP Auth: if the user cancels
the login dialog, we don't try to be smart and try
alternate URLs. It actually means the URL was just fine
but the user didn't want to authenticate.
Change-Id: If85dc2e01e30ff26decb78088bd912da785a89f9
Raphael Moll [Fri, 12 Aug 2011 16:11:09 +0000 (09:11 -0700)]
Merge "SdkMan2, log window comments & auto-scroll"
Raphael Moll [Fri, 12 Aug 2011 16:10:58 +0000 (09:10 -0700)]
Merge "Cleanup a few warnings in SdkLib."
The Android Open-Source Project [Fri, 12 Aug 2011 16:06:00 +0000 (09:06 -0700)]
merge from open-source master
Change-Id: I7f3106332dcab12aa62b2c199d25b86fa1d0e97f
Tor Norbye [Fri, 12 Aug 2011 15:55:28 +0000 (08:55 -0700)]
Merge "Remove @Override from methods implementing an interface"
The Android Open-Source Project [Fri, 12 Aug 2011 15:02:11 +0000 (08:02 -0700)]
merge from open-source master
Change-Id: I61ddab253943ade4c13568e7441d182519f2aa51
Siva Velusamy [Fri, 12 Aug 2011 14:51:45 +0000 (07:51 -0700)]
Merge "Use fonts as specified in preferences."
Siva Velusamy [Fri, 12 Aug 2011 14:51:32 +0000 (07:51 -0700)]
Merge "Add tests for LogCatMessageParser."
Raphael Moll [Fri, 12 Aug 2011 05:03:43 +0000 (22:03 -0700)]
Cleanup a few warnings in SdkLib.
Change-Id: Ie8429f077b7e3a2a7166b6fcd7b9454c9bc47088
Tor Norbye [Fri, 12 Aug 2011 02:46:08 +0000 (19:46 -0700)]
Remove @Override from methods implementing an interface
@Override'ing methods from an interface requires JDK 6.
Change-Id: I78dcf84dc690e5928f05a4d1a20e24a4e10d7eae
Siva Velusamy [Fri, 12 Aug 2011 00:37:04 +0000 (17:37 -0700)]
Use fonts as specified in preferences.
Update DDMS preference dialog to show only font preference when using
the new logcat view. The font preference key is obtained from
LogCatPanel in the new view so that the Eclipse ddms plugin can
also reuse most of the code.
Change-Id: I61afba27cde45ff8214e83b6fadfe488f6c954bb
Raphael Moll [Thu, 11 Aug 2011 22:46:42 +0000 (15:46 -0700)]
SdkMan2, log window comments & auto-scroll
Fixes some missing comments in the LogWindow class.
Also implement a rudimentary auto-scroll based on the
caret position being at the end when we append text.
Change-Id: Ie1dfecc2dc048113f786bc120c8f267eea955e0b
The Android Open-Source Project [Fri, 12 Aug 2011 00:21:53 +0000 (17:21 -0700)]
merge from open-source master
Change-Id: I2809c607571668be971b00ee36286f2cda19bff4
Tor Norbye [Fri, 12 Aug 2011 00:19:35 +0000 (17:19 -0700)]
Merge "Fix a few XML comment formatting corner cases"
Brett Chabot [Fri, 12 Aug 2011 00:08:07 +0000 (17:08 -0700)]
Merge "Add various getProperty methods."
The Android Open-Source Project [Thu, 11 Aug 2011 22:40:43 +0000 (15:40 -0700)]
merge from open-source master
Change-Id: Iac4c20ec61154718f78fe0556dca153c2b060752
Siva Velusamy [Thu, 11 Aug 2011 22:22:29 +0000 (15:22 -0700)]
Add tests for LogCatMessageParser.
Change-Id: I2fc1f14cbf72117112a217b2f9effb00b3e040a0
Siva Velusamy [Thu, 11 Aug 2011 22:34:30 +0000 (15:34 -0700)]
Merge "Support clearing all logcat messages from the table."
Siva Velusamy [Thu, 11 Aug 2011 22:34:18 +0000 (15:34 -0700)]
Merge "Support exporting selected logcat messages to a text file."
Siva Velusamy [Thu, 11 Aug 2011 22:34:02 +0000 (15:34 -0700)]
Merge "Fix logcat table scrolling behavior."
The Android Open-Source Project [Thu, 11 Aug 2011 22:27:57 +0000 (15:27 -0700)]
merge from open-source master
Change-Id: I7f1883c05fc90f755f6d8eb486d3da1309f49fa0
Raphael Moll [Thu, 11 Aug 2011 22:20:51 +0000 (15:20 -0700)]
Merge "SdkMan2: Log window."
The Android Open-Source Project [Thu, 11 Aug 2011 22:15:03 +0000 (15:15 -0700)]
merge from open-source master
Change-Id: Ib62fe0b8b32092418173ee454610a0f0f34ea196
Raphael Moll [Tue, 9 Aug 2011 23:02:25 +0000 (16:02 -0700)]
SdkMan2: Log window.
Change-Id: I97d173679519a1f535ec303ed1c996f16dd33c24
Raphaël Moll [Thu, 11 Aug 2011 22:03:12 +0000 (15:03 -0700)]
Merge "Add support for authenticated add-on servers."
Raphael Moll [Thu, 11 Aug 2011 22:01:56 +0000 (15:01 -0700)]
Merge "Add Apache Http-Client library files to ADT."
Tor Norbye [Thu, 11 Aug 2011 21:17:51 +0000 (14:17 -0700)]
Fix a few XML comment formatting corner cases
The cases are covered by the new unit tests.
Change-Id: I165def59dad59de7e8e1c4e5516c567722aa254e
Brett Chabot [Thu, 11 Aug 2011 02:44:46 +0000 (19:44 -0700)]
Add various getProperty methods.
Bug
5148643
Change-Id: I8efefdf07e8524f95dcb043a4eae1812b97b2739
Siva Velusamy [Thu, 11 Aug 2011 18:50:33 +0000 (11:50 -0700)]
Support clearing all logcat messages from the table.
Change-Id: If7fb4b181974ddd0c1c41e54f7c76bfb6b2812bc
Siva Velusamy [Thu, 11 Aug 2011 18:38:40 +0000 (11:38 -0700)]
Support exporting selected logcat messages to a text file.
Change-Id: Ia9c61a5e16ef12907f4402a076a587cc9f62613c
Pablo Leite [Mon, 30 May 2011 18:14:14 +0000 (15:14 -0300)]
Add support for authenticated add-on servers.
Displays a login prompt if necessary.
Note: This code depends on Apache http-client libraries.
Build files had been modified in order to add this dependency.
http-client libraries had also be added on prebuilt project.
prebuilt changeID=I084d78dd09a431bc3a2d77e77810b84c693bdcb7
GerritLink=https://review.source.android.com/#change,23387
Change-Id: Icada9b41a21fe3aacef9a1eff209a3fe5591a4e0
The Android Open-Source Project [Thu, 11 Aug 2011 19:29:37 +0000 (12:29 -0700)]
merge from open-source master
Change-Id: I6e877e927d9df8177abfbfebaa64a87d272ed83b
Bill Napier [Thu, 11 Aug 2011 19:21:25 +0000 (12:21 -0700)]
Merge "Added view introspection to ChimpChat and MonkeyRunner"
Raphael Moll [Wed, 10 Aug 2011 17:24:06 +0000 (10:24 -0700)]
Add Apache Http-Client library files to ADT.
This is a follow up to Change I084d78dd from prebuilt.git
to add the files required by sdklib to ADT.
Change-Id: I651ddf8f6dec480843c5bccd7d3296227b262937
Siva Velusamy [Thu, 11 Aug 2011 17:55:24 +0000 (10:55 -0700)]
Fix logcat table scrolling behavior.
This patch makes the logcat table scroll behavior to be consistent
with other consoles/terminals: The table will scroll to reveal a
newly added message if and only if the last logcat message is
currently displayed (which is the same as saying if the scrollbar
is at the bottom of the table). If the user scrolls up the table
by moving the scroll thumb, then newly added messages will not
trigger a scroll.
Change-Id: Ia9c180b093de91406e8ced020589c71b4d2e1eb1
The Android Open-Source Project [Thu, 11 Aug 2011 05:20:39 +0000 (22:20 -0700)]
merge from open-source master
Change-Id: I3047a816c09d3b4ffad503b14550641677155f31
Siva Velusamy [Thu, 11 Aug 2011 05:16:38 +0000 (22:16 -0700)]
Merge "Create new project ddmuilib-tests"
Siva Velusamy [Thu, 11 Aug 2011 05:13:55 +0000 (22:13 -0700)]
Merge "Add support for filtering logcat messages."
Siva Velusamy [Tue, 9 Aug 2011 23:28:19 +0000 (16:28 -0700)]
Create new project ddmuilib-tests
Change-Id: I62fbf052dead8f9c4378c42c1850851c51b794fc
Siva Velusamy [Tue, 9 Aug 2011 20:31:40 +0000 (13:31 -0700)]
Add support for filtering logcat messages.
In the logcat view, add a panel on the side where users can
create/edit/delete filters for logcat messages. Users can filter
by the message tag, pid or loglevel.
Change-Id: Ic85397794e5437b761b91a74adb0dd6a58bc74ed
The Android Open-Source Project [Wed, 10 Aug 2011 22:37:23 +0000 (15:37 -0700)]
merge from open-source master
Change-Id: I414a1c7d99ff0d65eaa2c938190bb338b90da081
Siva Velusamy [Wed, 10 Aug 2011 22:24:50 +0000 (15:24 -0700)]
Merge "Get easymock from ANDROID_OUT_FRAMEWORK"
The Android Open-Source Project [Wed, 10 Aug 2011 22:24:36 +0000 (15:24 -0700)]
merge from open-source master
Change-Id: Iafb1e9cb4d0a998359400cd5c9b7b62657f69a87
Siva Velusamy [Wed, 10 Aug 2011 22:24:11 +0000 (15:24 -0700)]
Merge "Save/Restore the width of all columns in the LogCatPanel table."
Tor Norbye [Wed, 10 Aug 2011 22:22:24 +0000 (15:22 -0700)]
Merge "Improve partial XML formatting"
Tor Norbye [Wed, 10 Aug 2011 22:21:54 +0000 (15:21 -0700)]
Merge "Format newly created files"
Tor Norbye [Sat, 6 Aug 2011 00:05:37 +0000 (17:05 -0700)]
Improve partial XML formatting
This changeset improves the behavior of the formatting when formatting
just a part of the document (e.g. the selected region, or more
accurately the nodes overlapping the selected region.)
First, it looks up the current indentation levels in the document of
the start node and its parent and uses that for the indentation, which
means that nodes appear to be pretty printed in line instead of
jumping to whatever the absolute indentation level would correspond
to.
Second, the formatter now has a mode where it can format only the
opening tag of an element. This is a special case of formatting a node
which is particularly useful when you enable automatic formatting by
the layout editor, since just setting a property on a root element
shouldn't reformat all the element children of the edited node.
Third, there are various tweaks to how the whitespace is handled
around the inserted node. It also fixes a couple of bugs.
Change-Id: If1dd2dc5091a08b770927cd4b9fcafe0c032a216
Tor Norbye [Fri, 5 Aug 2011 00:15:37 +0000 (17:15 -0700)]
Format newly created files
This changeset hooks the XML formatter up to the New XML File and New
Android Project wizards such that the newly created XML files are run
through the formatter, thereby picking up whatever formatting
customizations the user has made.
It also makes it such that when you finish the New XML File wizard for
a file that does not have a graphical editor, the caret position is
shown and the view receives focus so you can start editing at the
appropriate position.
Finally, it tweaks the defaut root element for color-lists.
Change-Id: I19606a085d6df132009679ddfb4c91152cbdc453
The Android Open-Source Project [Wed, 10 Aug 2011 22:11:56 +0000 (15:11 -0700)]
merge from open-source master
Change-Id: Iaa8ba04a4b18c9168634aca93a47fc2dfc0a0746
Tor Norbye [Wed, 10 Aug 2011 22:10:25 +0000 (15:10 -0700)]
Merge "Ability to suppress rendering fidelity warnings"
The Android Open-Source Project [Wed, 10 Aug 2011 20:54:34 +0000 (13:54 -0700)]
merge from open-source master
Change-Id: Icf0ca2f6a23ef02fb6672dc0fbc1dccd3d2c2bfd
Tor Norbye [Wed, 10 Aug 2011 20:51:20 +0000 (13:51 -0700)]
Merge "Update XML Mac keybindings for select enclosing and select last"
Tor Norbye [Wed, 10 Aug 2011 20:51:12 +0000 (13:51 -0700)]
Merge "Reformat the ADT plugin.xml file"
Tor Norbye [Wed, 10 Aug 2011 20:50:02 +0000 (13:50 -0700)]
Merge "Make the plugin build script for for Mac OSX"
The Android Open Source Project [Wed, 10 Aug 2011 14:28:56 +0000 (07:28 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: If1f4763cce0f265f6a16f44b7a4221327ff4b1a9
Siva Velusamy [Sat, 6 Aug 2011 00:25:33 +0000 (17:25 -0700)]
Get easymock from ANDROID_OUT_FRAMEWORK
Change-Id: Ife3e5d1f5f1884a2e304dd18e109a6d7325ab90c
Siva Velusamy [Thu, 4 Aug 2011 21:38:05 +0000 (14:38 -0700)]
Save/Restore the width of all columns in the LogCatPanel table.
Create all columns using TableHelper.createTableColumn which adds
listeners that save the column width whenever they are resized by
the user, and restores them on subsequent creations.
Change-Id: I35d09a981b94aa086899e3bf74f2243029c60b2b
The Android Open-Source Project [Tue, 9 Aug 2011 20:18:54 +0000 (13:18 -0700)]
merge from open-source master
Change-Id: I53347883a596815648f9a57746fac7eb84629548
Tor Norbye [Tue, 9 Aug 2011 20:10:13 +0000 (13:10 -0700)]
Merge "Fix template creation of ids"
Tor Norbye [Tue, 9 Aug 2011 20:09:55 +0000 (13:09 -0700)]
Merge "Fix linear layout and frame layout unit tests"
Tor Norbye [Mon, 8 Aug 2011 21:01:35 +0000 (14:01 -0700)]
Make the plugin build script for for Mac OSX
The build_server script used to build the plugin zip file was Linux
specific. This changeset tweaks the scripts such that they will also
run on Mac OSX. It also adds various .gitignore filters such that the
temporary files created by the build script are ignored by git.
Change-Id: I77cfe6bfb65be86c11beb50bcab9c345433b5a8e
The Android Open-Source Project [Tue, 9 Aug 2011 01:17:56 +0000 (18:17 -0700)]
merge from open-source master
Change-Id: I27bd00b8662b9169f61f0875ac3207d549b60c92
Raphael Moll [Tue, 9 Aug 2011 01:07:04 +0000 (18:07 -0700)]
Merge "SdkMan2: Correctly handle local items newer than remote."
Raphael Moll [Mon, 8 Aug 2011 22:18:19 +0000 (15:18 -0700)]
SdkMan2: Correctly handle local items newer than remote.
This fixes an edge case where a local package is newer
(e.g. has a higher revision number) than a remote one.
This typically happens during development and QA but
not in a normal user scenario.
In this case the newer local package 'hides' the remote
package so that we don't see a dup in the list.
Also fixes the source filter when merging remote packages
and add a comment on the rationale of which, namely that
if two remote repos were to publish the same packages we
DO want to see dups. This is not supposed to happen and
we would want to see it and have it fixed.
Change-Id: Iab51cfd64b4078f3233872973173465a924eac1e
The Android Open-Source Project [Tue, 9 Aug 2011 00:52:46 +0000 (17:52 -0700)]
merge from open-source master
Change-Id: I05af4707413ca01e4a26750f25371e11ffa35da5
Raphael Moll [Tue, 9 Aug 2011 00:38:38 +0000 (17:38 -0700)]
Merge "SdkMan2: Can only install remote packages, not locally installed ones."
Raphael Moll [Mon, 8 Aug 2011 22:00:50 +0000 (15:00 -0700)]
SdkMan2: Can only install remote packages, not locally installed ones.
Change-Id: Ia56b5f8a3458c139d79cfdb4acef45f3f89cb5e4
The Android Open-Source Project [Mon, 8 Aug 2011 17:59:05 +0000 (10:59 -0700)]
merge from open-source master
Change-Id: Iee36c92ed11abb8dbc72851986a1d4a3f33d8c33
The Android Open-Source Project [Mon, 8 Aug 2011 17:46:12 +0000 (10:46 -0700)]
merge from tools_r13
Change-Id: I08d87676cbdcd2908c7157b726d7350058cc5c1e
The Android Open-Source Project [Mon, 8 Aug 2011 17:46:08 +0000 (10:46 -0700)]
merge from open-source master
Change-Id: If0dab193ba393de8b8a8cc2007c2c9c36fa745b6
Jean-Baptiste Queru [Mon, 8 Aug 2011 17:38:22 +0000 (10:38 -0700)]
Ignore from tools_r13
Change-Id: Ieb0d164466d88021a1c22cdbbf1794bb8fc471d9
Tor Norbye [Sat, 6 Aug 2011 04:28:57 +0000 (21:28 -0700)]
Fix template creation of ids
We have a quickfix for creating missing resources, such as
@string/foo. This code was not working correctly for @id resources,
because ids use a different declaration syntax (there is no value to
be specified as a text node child of the item tag, and the type
attribute should be specified).
This changeset also fixes ResourceHelper's isFileBasedResourceType().
ResourceHelper.isFileBasedResourceType recently started returning true
for ResourceType.ID. This seems related to a change in the return
values from FolderTypeRelationship.
In any case, ids should not be treated as #isFileBasedResourceType,
because that method is used to determine whether the id is one-to-one
with a filename, which in turn means that the resource name validator
will insist that the filename can only contain -lowercase- characters
(plus digits and underscores).
Incidentally this change was caught by a unit test, yay!
Change-Id: I0c95c20d666d0744fda73e8230846d24ddd437c3
Tor Norbye [Sun, 7 Aug 2011 06:03:41 +0000 (23:03 -0700)]
Ability to suppress rendering fidelity warnings
If you're working with a custom component that uses unsupported
graphics operations, the layout editor will show an error area. This
error is always there. That can be annoying since there's nothing you
can do about it after reporting a bug.
This changeset adds the ability to suppress these errors for the
current IDE session. It adds a "Ignore" hyperlink next to each
fidelity rendering error message, and when you click it, the specific
type of rendering error is suppressed and hidden for the current IDE
session.
These warnings are only suppressed for a single session and not
permanently. This is because you are suppressing an error not for a
specific layout but for any occurrence of that error. If these ignore
settings were persisted you might open some unrelated layout in the
future and be puzzled why it does not look right.
Change-Id: I2d20a36aee7767257b16ad805b0e8da36a6eb97e
Tor Norbye [Sat, 6 Aug 2011 19:41:02 +0000 (12:41 -0700)]
Update XML Mac keybindings for select enclosing and select last
One of the most useful selection operations in Eclipse Java editors is
"select enclosing" and "select last". The keybindings on Mac are
Ctrl-Shift-Up and Ctrl-Shift-Down. However, in XML files, those
keybindings do something different (making the caret jump, without
selection, to the previous element instead of the parent).
It turns out the XML editor also implements those actions, but bound
to other keys on the Mac. The reason for this is that the Java editor
applies special mac specific keybindings for those actions, and the
XML editor does not.
This changeset updates the keybindings, for Mac only, to the same
keybindings as the Mac-only Java editor bindings for the same actions.
Change-Id: I81f7f6d14fe8dd4a79aeace757d6c25c011eedb8
The Android Open-Source Project [Sun, 7 Aug 2011 05:01:09 +0000 (22:01 -0700)]
merge from open-source master
Change-Id: Iac0895ac9bb28942c4e1b3d88257b18fe1888be3
Raphael Moll [Sun, 7 Aug 2011 04:56:03 +0000 (21:56 -0700)]
Merge "SdkMan2: Fix edge case when install/delete packages."
Raphael Moll [Sun, 7 Aug 2011 04:55:57 +0000 (21:55 -0700)]
Merge "SdkMan2: Show number of packages to install/delete"
Raphael Moll [Sun, 7 Aug 2011 04:55:52 +0000 (21:55 -0700)]
Merge "SdkMan2: Fix load when there are no remote sources."
Tor Norbye [Sat, 6 Aug 2011 19:27:24 +0000 (12:27 -0700)]
Reformat the ADT plugin.xml file
The plugin.xml file had a lot of very inconsistent formatting,
primarily because the Eclipse Format action seems to be disabled in
it, and most of the contents are the result of copy pasting in
snippets to register various services based on code samples in
documentation.
This changeset simply reformats the file (4 spaces, one attribute per
line) to make the format consistent and easier to adhere to when
inserting new content.
There are NO semantic changes - it's a pure reformat only affecting
whitespace.
Change-Id: I42237f67ada0e2ddeffc5e305a7df1083f0fdb97
The Android Open-Source Project [Sat, 6 Aug 2011 04:38:22 +0000 (21:38 -0700)]
merge from open-source master
Change-Id: Ib84e1d8c17c3763abf852b527baad5c59a3e6399
Tor Norbye [Sat, 6 Aug 2011 04:34:24 +0000 (21:34 -0700)]
Merge "Miscellaneous XML formatting fixes"
Tor Norbye [Sat, 6 Aug 2011 04:26:44 +0000 (21:26 -0700)]
Fix linear layout and frame layout unit tests
I changed the code which draws drop feedback recently to use a more
efficient call (calling drawRect(x1,y1,x2,y2) directly instead
of constructing a new Rectangle object and calling drawRect(Rect).
Some golden files checking graphics output needs to be updated.
Change-Id: I369fed9cb0756ff4f3aa970c1bdd552d0f55faaa