OSDN Git Service
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"
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
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."
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
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
Raphael Moll [Fri, 5 Aug 2011 20:12:23 +0000 (13:12 -0700)]
SdkMan2: Show number of packages to install/delete
Change-Id: I2113998c9a7274d5c468f27f4b51b8d2293d0c17
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
The Android Open-Source Project [Fri, 5 Aug 2011 17:28:05 +0000 (10:28 -0700)]
merge from open-source master
Change-Id: Id6e8a934082731aa709a4c22b0815b19e9d1e4ae
Xavier Ducrohet [Fri, 5 Aug 2011 17:14:22 +0000 (10:14 -0700)]
Merge "Fix some UT."
The Android Open Source Project [Fri, 5 Aug 2011 01:46:24 +0000 (18:46 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I3dc8db28137ce5f009be37a0b809ce4322e796ca
Tor Norbye [Fri, 5 Aug 2011 00:14:41 +0000 (17:14 -0700)]
Miscellaneous XML formatting fixes
This changeset contains a number of tweaks to the XML formatter:
- Handle "end-of-line" comments, such as those seen in some drawable
<selector> files:
<item android:state_pressed="true"
android:color="#
ffff0000"/> <!-- pressed -->
<item android:state_focused="true"
android:color="#
ff0000ff"/> <!-- focused -->
<item android:color="#
ff000000"/> <!-- default -->
Here the comments will continue to live on the same line as the end
tag.
- If the unformatted XML had a blank line between a comment and the
next element, then insert a blank line there in the formatted
XML as well
- Always place the xmlns: attribute on the same line as the opening
element tag
- In alphabetical attribute sorting, make xmlns: attributes an
exception and always sort them to the front just as is the case for
logical attribute sorting
- Fix some cases where turning on "remove all lines" would still leave
some blank lines, such as in front of the root element closing
tag and around comments
- Fix unit tests such that they run with the default values for the
formatter; they were accessing an uninitialized AdtPrefs instance
(since they are not running as plugin tests) and were inadvertently
just using "false" for all the flags.
- Add more unit tests.
Change-Id: I537f8afe4ca4d775b5f91574b895ba90a2741f5c
Xavier Ducrohet [Fri, 5 Aug 2011 00:44:25 +0000 (17:44 -0700)]
Fix some UT.
Change-Id: Ia3ca9ef68d6435a323959913a6bd9298e9bcf0c9
The Android Open-Source Project [Fri, 5 Aug 2011 00:06:49 +0000 (17:06 -0700)]
merge from open-source master
Change-Id: I02dc4173e9ba991a37c2aad0c86936bfae1b69a8
Xavier Ducrohet [Thu, 4 Aug 2011 23:55:02 +0000 (16:55 -0700)]
Merge "Add eclipse version to usage stat ping."
The Android Open-Source Project [Thu, 4 Aug 2011 23:54:00 +0000 (16:54 -0700)]
merge from open-source master
Change-Id: Id5d9ae2b68a1a2fe25e457ab54a281dad7086535
Xavier Ducrohet [Thu, 4 Aug 2011 23:41:18 +0000 (16:41 -0700)]
Merge "Add pushFile/pullFile interface for IDevice."
The Android Open-Source Project [Thu, 4 Aug 2011 23:41:16 +0000 (16:41 -0700)]
merge from open-source master
Change-Id: I6cdc76392b676ce5a9162c6dc91ea7140a4cffca
Raphael Moll [Thu, 4 Aug 2011 23:41:10 +0000 (16:41 -0700)]
Merge "Split PackagesPage and PackageLoader inner classes."
Raphael Moll [Thu, 4 Aug 2011 23:41:05 +0000 (16:41 -0700)]
Merge "SDK Manager: refactor classes for manager 1 versus 2."
Raphael Moll [Thu, 4 Aug 2011 23:41:01 +0000 (16:41 -0700)]
Merge "SdkManager2: UTs for initial platform selection."
Raphael Moll [Thu, 4 Aug 2011 23:40:54 +0000 (16:40 -0700)]
Merge "SdkMan2: only select recent new platforms."
Tor Norbye [Thu, 4 Aug 2011 23:30:44 +0000 (16:30 -0700)]
Merge "Fix NPE"
Tor Norbye [Thu, 4 Aug 2011 23:28:51 +0000 (16:28 -0700)]
Fix NPE
Change-Id: I044342e5aa6b3aaa87efdcc79bbcb3db93190252
Xavier Ducrohet [Thu, 4 Aug 2011 23:27:52 +0000 (16:27 -0700)]
Add eclipse version to usage stat ping.
Change-Id: I14dba0dd7cb900c2e700e4da055aee7bb7d1f9cd
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
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
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
The Android Open-Source Project [Thu, 4 Aug 2011 20:14:40 +0000 (13:14 -0700)]
merge from open-source master
Change-Id: Ic8120ec9bcca6cb563d8da72ff8234ed446ecdda
Tor Norbye [Thu, 4 Aug 2011 20:10:14 +0000 (13:10 -0700)]
Merge "Fix formatting bug for formatting ranges"
Tor Norbye [Thu, 4 Aug 2011 20:09:56 +0000 (13:09 -0700)]
Merge "Add tag-handling for Go To Matching in XML documents"
Tor Norbye [Thu, 4 Aug 2011 20:09:46 +0000 (13:09 -0700)]
Merge "Improve smart-indent handling in XML files"
Raphael Moll [Thu, 4 Aug 2011 19:27:44 +0000 (12:27 -0700)]
SdkManager2: UTs for initial platform selection.
Change-Id: I4aef0e6ad8993e792a20f95f37a62f44e858b426
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
The Android Open-Source Project [Thu, 4 Aug 2011 19:10:47 +0000 (12:10 -0700)]
merge from open-source master
Change-Id: I12dcc0f85622b1d1baf89feedde0143252a35cec
Siva Velusamy [Thu, 4 Aug 2011 19:00:28 +0000 (12:00 -0700)]
Merge "Initial 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
The Android Open-Source Project [Thu, 4 Aug 2011 18:57:10 +0000 (11:57 -0700)]
merge from open-source master
Change-Id: Id2bc8ffee99950b65406027fb45c3d174e909182
Siva Velusamy [Thu, 4 Aug 2011 18:54:16 +0000 (11:54 -0700)]
Merge "Conditionally create old logcat view."
The Android Open-Source Project [Thu, 4 Aug 2011 18:05:24 +0000 (11:05 -0700)]
merge from open-source master
Change-Id: I569fa0135c3e25126df9cea9684ba1c692935e6b
Siva Velusamy [Thu, 4 Aug 2011 17:58:06 +0000 (10:58 -0700)]
Merge "Convert tabs to spaces"
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
Siva Velusamy [Tue, 2 Aug 2011 22:34:25 +0000 (15:34 -0700)]
Convert tabs to spaces
Change-Id: I7032663689943b22342b49736f0656df778cd456
The Android Automerger [Thu, 4 Aug 2011 14:03:29 +0000 (07:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open-Source Project [Thu, 4 Aug 2011 01:06:36 +0000 (18:06 -0700)]
merge from open-source master
Change-Id: I37d59786bc2cabac8a48f4e76fdec83ed652cfd3
Raphael Moll [Thu, 4 Aug 2011 00:53:02 +0000 (17:53 -0700)]
Merge "sdkman2: if nothing selected yet, select new/updates."
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
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
Raphael Moll [Wed, 3 Aug 2011 23:31:34 +0000 (16:31 -0700)]
Merge "Properly support spaces in ant project directories." into tools_r13
Raphael Moll [Wed, 3 Aug 2011 23:31:18 +0000 (16:31 -0700)]
Merge "Add "android create avd --abi" parameter." into tools_r13
Raphael Moll [Wed, 3 Aug 2011 23:30:59 +0000 (16:30 -0700)]
Merge "Fix android.bat for Windows SDK." into tools_r13
Raphael Moll [Tue, 12 Jul 2011 02:11:32 +0000 (22:11 -0400)]
Properly support spaces in ant project directories.
After applying https://review.source.android.com/24515 for
the dalvik/dx change, this allows ant project to build
correctly on Windows if there's a space in their directory
path.
(cherry picked from commit
a9dcfb3777eddee860ddb59f5ae77a611ffab63a)
Change-Id: I9d8a759de5491ef2439920886c4b2d5e8c4db92b
Raphael Moll [Fri, 8 Jul 2011 21:48:17 +0000 (17:48 -0400)]
Add "android create avd --abi" parameter.
SDK bug
4965341
(cherry picked from commit
65aa2161c1ad294ef141b479b6f49dabb2edb23b)
Change-Id: Ic401e4ca56e19e416b0331baadbf742229bf60a0
Raphael Moll [Thu, 7 Jul 2011 11:40:06 +0000 (07:40 -0400)]
Fix android.bat for Windows SDK.
android.bat was not properly copying swtmenbar.jar
to the temp folder, so it wasn't found at runtime.
Also added some debug info wrapping the menu bar usage
and a comment on how to remotely debug the swtmanager.
(cherry picked from commit
0447f74bfd36d3c458f478fa637eee377f313f3f)
Change-Id: Ib10d974a518e65ae38f66af641ccbf8cb85689d3
The Android Open-Source Project [Wed, 3 Aug 2011 19:36:33 +0000 (12:36 -0700)]
merge from open-source master
Change-Id: Ic7c118d50e67a9c5d7ddd26634d0c835bdf6f60e
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
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
Tor Norbye [Wed, 3 Aug 2011 18:25:15 +0000 (11:25 -0700)]
Merge "Use Windows line delimiters on Windows"
Xavier Ducrohet [Wed, 3 Aug 2011 18:04:38 +0000 (11:04 -0700)]
Merge "Update tools/ADT to rev 14."
Xavier Ducrohet [Wed, 3 Aug 2011 18:04:06 +0000 (11:04 -0700)]
Merge "Update tools to r13" into tools_r13
The Android Automerger [Wed, 3 Aug 2011 14:03:20 +0000 (07:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open-Source Project [Wed, 3 Aug 2011 12:30:17 +0000 (05:30 -0700)]
merge from open-source master
Change-Id: Id7f3eb4665e093e7eb56afdadcc4a412c7536a4e
David Turner [Wed, 3 Aug 2011 12:20:05 +0000 (05:20 -0700)]
Merge "Fix magnetic field sensor string."
Xavier Ducrohet [Wed, 3 Aug 2011 01:20:38 +0000 (18:20 -0700)]
Update tools/ADT to rev 14.
Change-Id: Id29498fde61185a63812b7267b64560a8fd54dc5
Xavier Ducrohet [Wed, 3 Aug 2011 01:11:27 +0000 (18:11 -0700)]
Update tools to r13
Change-Id: If3f37a98f3ebba30087672f251ba72bf2b00e497
The Android Automerger [Tue, 2 Aug 2011 23:23:44 +0000 (16:23 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Open-Source Project [Tue, 2 Aug 2011 22:18:46 +0000 (15:18 -0700)]
merge from open-source master
Change-Id: Ie9bb30a3e763bb1d5f83c6e18303ca7317279176
Raphael Moll [Tue, 2 Aug 2011 22:11:14 +0000 (15:11 -0700)]
Merge "SDK Man2: Fix initial load of all sources."
The Android Open-Source Project [Tue, 2 Aug 2011 21:53:43 +0000 (14:53 -0700)]
merge from open-source master
Change-Id: I07b53044c974653154d7c4628d9141b7a3cb7479
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"
Tor Norbye [Tue, 2 Aug 2011 21:41:07 +0000 (14:41 -0700)]
Use Windows line delimiters on Windows
Change-Id: I33094888432214fc5c70c4c4392d8afd932a3a7a
The Android Open-Source Project [Tue, 2 Aug 2011 21:28:29 +0000 (14:28 -0700)]
merge from open-source master
Change-Id: I2da24f65530d426b967f7f2712a21d851bea113c
Tor Norbye [Tue, 2 Aug 2011 21:25:29 +0000 (14:25 -0700)]
Merge "Add 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
Raphael Moll [Tue, 2 Aug 2011 21:10:38 +0000 (14:10 -0700)]
SDK Man2: Fix initial load of all sources.
Change-Id: I54598804adad6b21ba524829570d28135f0586ca
The Android Open-Source Project [Tue, 2 Aug 2011 20:49:17 +0000 (13:49 -0700)]
merge from open-source master
Change-Id: I65eaff5a9d6c43a4d2547dfd8db02c3f9066b1e0
Raphael Moll [Tue, 2 Aug 2011 20:39:17 +0000 (13:39 -0700)]
Merge "Fix 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
The Android Open-Source Project [Tue, 2 Aug 2011 20:08:57 +0000 (13:08 -0700)]
merge from open-source master
Change-Id: Iad708bec6e3d604922c8fa8ea629af1e7fa42df9
Josiah Gaskin [Tue, 2 Aug 2011 20:02:07 +0000 (13:02 -0700)]
Merge "ADT Resource Repo stores IDs and Called Once"
The Android Open Source Project [Tue, 2 Aug 2011 14:33:56 +0000 (07:33 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I8eb46c1d82342f537a880adf8fa1cd0f1612ed2c
The Android Automerger [Tue, 2 Aug 2011 14:07:00 +0000 (07:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
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
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