OSDN Git Service
Raphael [Wed, 5 Oct 2011 20:36:29 +0000 (13:36 -0700)]
SDK Manager: fix handling of source URLs. Do not merge.
This changes how source URLs are handled. Packages
from different sources were previously treated as
separate if the packages were the same (e.g. same
platform API) but the source URLs were different.
Instead this checks the hostname+domain name of the URL
is different, as well as the type of the source (that
is a sdk repository vs addon repository).
(cherry picked from commit
d66d4b7804ce5585bed335168a0c7f3f178a11b0)
Change-Id: Ic127c4111e5028d467ad89c987c5f39cb8f8e8d7
Siva Velusamy [Tue, 4 Oct 2011 22:27:20 +0000 (15:27 -0700)]
Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.
Change-Id: I30174344cd5909e3de773b30cac711dd4f609f87
Tor Norbye [Tue, 4 Oct 2011 16:42:44 +0000 (09:42 -0700)]
Formatting fix: ensure no double blank new lines between elements. DO NOT MERGE.
Change-Id: I2a03e12adbf4a286114766c7d679cb7b65d3e92e
Tor Norbye [Mon, 3 Oct 2011 21:31:11 +0000 (14:31 -0700)]
Look up space width from settings instead of hardcoded to 4. DO NOT MERGE.
Change-Id: Id801b75f3a9ea494757e5846812ca568f9a337a3
Tor Norbye [Sat, 1 Oct 2011 04:01:06 +0000 (21:01 -0700)]
Fix XML formatting from outside the editor (Source > Format). DO NOT MERGE.
This changeset fixes this issue:
20450: Source->Format for XML files in Project Explorer in 14-preview
applies old XML rules instead of new Android-aware ones
Basically, the Eclipse XML support does not consult the
StructuredTextViewerConfigurationXML configuration when formatting
files. To work around this, this changeset overrides the format
processor defined for XML files and redirects to the ADT custom
formatter when the option to use a custom formatter is set.
Unfortunately, setting the formatProcessor in the ADT plugin does not
work, because it turns out that the WTP code to process layer
registrations processes plugins in alphabetical order of plugin names
(rather than say plugin dependency order), and as a result, the WTP
registration is processed later than the ADT one (because org.eclipse
> com.android) and it clobbers our registration.
To work around this, this changeset adds a *new* plugin, an overlay
for ADT which is named "overlay.com.android.eclipse.(etc)" which sorts
alphabetically later than org.eclipse. The plugin is basically empty
(it just provides a registration of the ADT format processor), and it
is registered as just a part of the ADT plugin so it should not be
exposed to users directly.
Change-Id: I05c617ca8e879d2a46de9def9f97f3f7a79884ce
Raphael [Wed, 5 Oct 2011 06:39:57 +0000 (23:39 -0700)]
SDK: fix SdkManager class not releasing FileInputStream. Do not merge.
In various parts of the code base, I see code that creates
a FileInputStrea and never closes it. Unfortunately on
Windows that means the file will stay locked for as long
as the java process is alive.
In this case the SdkManager wasn't closing to input streams
which makes the source.properties files locked, and thus
it makes it impossible to upgrade/delete the corresponding
packages.
There are more occurences of this elsewhere in the code.
(cherry picked from commit
4c7bf6fe4dbf06f43d86b639ce5144ffeff7a626)
Change-Id: I36ad68a216b99fb471b941cb4ccdc88cd3bfad3b
Raphael [Wed, 5 Oct 2011 06:31:35 +0000 (23:31 -0700)]
SDK Manager: Fix NPE when deleting local archive. Do not merge.
Properly enforce that all local archive should have
an actual installation path to be considered local.
This was missing in the system image and the source
archives introduced last week.
(cherry picked from commit
903ae4af34664fb8ffffa7a86e907814f860dab1)
Change-Id: I7265bf8460acb5c9ff5c9f1df6770b82e3b3e2f8
Raphael [Mon, 3 Oct 2011 22:34:45 +0000 (15:34 -0700)]
SDK: change SDK_TEST_URLS behavior. Do not merge.
When SDK_TEST_URLS is set, it prevents the default
sources from being loaded. This makes it easier to
test just a new site.
(cherry picked from commit
70164aa4ebb8f3186e58f922ad6b7d64f28bed01)
Change-Id: Ic9fc4f70de5993f056ebe860359a0cfa615a074b
Raphael Moll [Wed, 5 Oct 2011 05:16:16 +0000 (22:16 -0700)]
Merge "SDK: fix typo in android.bat" into tools_r14
Raphael Moll [Wed, 5 Oct 2011 05:13:02 +0000 (22:13 -0700)]
SDK: fix typo in android.bat
This prevents httpcore from being copied correctly.
Change-Id: I28d6b4020e854cbe914fd418e51e6a53e7c5444f
Xavier Ducrohet [Tue, 4 Oct 2011 20:32:24 +0000 (13:32 -0700)]
Cherrypick 6a5504 from master. do not merge.
Make source.prop more important than build.prop when parsing platforms.
Change-Id: I126d4ed06fd1aa5125add58c17c3cebc4ec6b780
Raphael [Tue, 4 Oct 2011 22:33:15 +0000 (15:33 -0700)]
SDK: use repository-N.xml by default. Do not merge.
(This is part of Change I566b6945 but I had forgotten
to amend & upload, grrr.)
(cherry picked from commit
46b86398f7287cbdc88a15f9f6a2418ba29a7dbc)
Change-Id: I71ad810ac2ddbd11ece7f8e5afea22740a52100f
Raphael [Tue, 4 Oct 2011 19:54:37 +0000 (12:54 -0700)]
SDK: Use a different repository-N.xml for updating. Do not merge.
(cherry picked from commit
8f4710850b3a01d6e5f1188440c59d6999646858)
Change-Id: I5d0c733267f04e4ad386ae3ae6853da2ecf9de15
Raphael [Tue, 4 Oct 2011 20:25:25 +0000 (13:25 -0700)]
SDK: revert
c649a334 and fix missing \n properly. Do not merge.
(cherry picked from commit
b4ea99769f2bc149ac3a3fef77c49b7b4b83fe90)
Change-Id: Ifee9c7706f29f8ab2968c9277bdd293182df0900
Tor Norbye [Mon, 3 Oct 2011 16:15:23 +0000 (09:15 -0700)]
XML Comment Formatting Fixes. DO NOT MERGE.
This changeset fixes issue 20452 related to XML comment
handling. There are several changes.
First it fixes a truncation bug where the last character in a comment
could get erased.
Second it makes sure we don't end up with double blank lines, since
there were cases where the comment formatter would insert a newline
(to preserve newlines after comments in the original document) and a
subsequent element or close tag would also insert a newline (which is
where the normal blank lines are added). Now the code will peek at the
write buffer to make sure we haven't already added a blank line.
Third, it attempts to handle multiline comments a bit better such that
the code which preserves indentation of the first comment line will
dedent down to the minimum indentation level of the block comment.
This means that we will format
<!-- First
Second -->
into
<!--
First
Second
-->
instead of
<!--
First
Second
-->
as the code did up until now. (The current handling was there to make
<!-- This is
a comment -->
format into
<!--
This is
a comment
-->
)
Unit tests.
Change-Id: I7201b55a2c824c3c0b43287e853bc9b75d74ed7f
Tor Norbye [Sat, 1 Oct 2011 04:00:43 +0000 (21:00 -0700)]
Ensure that deletion hook is only run on valid parents. DO NOT MERGE.
There's now a "deletion hook" for ViewRules where they get a chance to
clean up after a set of children have been deleted. This changeset
guards against the case where the parent reference was null.
Change-Id: Ib2cfd0543ff55726ff488b57262267f610373639
Tor Norbye [Fri, 30 Sep 2011 18:45:26 +0000 (11:45 -0700)]
Refactoring quick fix adjustments to caret and selection handling. DO NOT MERGE
This changeset changes the logic in the refactoring quickfix (which
adds the Android refactorings based on the current caret position,
lexical context and selection).
It now allows some of the refactorings to be run when there is a
selection (this fixes "20393: Extract string functionality in Android
XML files"), and it makes other refactorings work when there is no
selection (it implicitly selects the surrounding element).
It also ensures that the Extract Style refactoring won't be listed at
the top if the attribute under the cursor is not a stylable attribute,
and it makes some other adjustments to the proposal order.
Change-Id: I1ca305d9c66ae4eb6cd9a4f45f6803bb2444abdb
Siva Velusamy [Thu, 29 Sep 2011 21:34:39 +0000 (14:34 -0700)]
Provide a way to show/hide the filters column. Do not merge.
(cherry picked from commit
c9192e375844e45ccb74ee69150717a31385564f)
Change-Id: Iadfc8be7d20a85c79ff94cf62f14345392cf999b
Raphael [Fri, 30 Sep 2011 20:03:45 +0000 (13:03 -0700)]
SDK: fix missing \n in 'android create avd'. Do not merge.
SDK Bug: 20430
(cherry picked from commit
c649a334d7bc656ea3c00cd9d3d102c88fbf8f80)
Change-Id: I8b4370b0d4ec4b96e9b65c214a9e06506b615a41
Tor Norbye [Wed, 28 Sep 2011 14:42:38 +0000 (07:42 -0700)]
Cherrypick fcd339 from master. do not merge.
Find non-constant expr errors and offer migration explanation
In ADT 14, library projects will generate R fields that are not
constant, which means you cannot use them as case labels in a switch
statement. This means some existing projects may not compile. However,
the reason for this isn't obvious until you know the details of how
library projects work. Also, converting switch statements to if/else
statements is easy in Eclipse but that may not be known to all users.
This changeset adds a quickfix processor which recognizes the specific
compilation error (non-constant expressions cannot be used in case
statements), and if it looks related to Android R fields, then it
creates a fix proposal.
The fix proposal is simple: it just opens a dialog which explains the
problem, and explains how to fix it (along with a hyperlink to more
information on the ADT 14 update process).
The main advantage of this approach is that it shows up as a lightbulb
right in the editor margin (for those users who are affected by this
error only), and even just hovering over the error will show the fix
display string which talks about Migrating Android code and the extra
info states that the fix can be invoked for more info.
Change-Id: Ieb208ac459454310f5a6cce6e933d9115a135322
Tor Norbye [Wed, 28 Sep 2011 23:32:23 +0000 (16:32 -0700)]
Cherrypick d7b602 from master. do not merge.
Remove the Fancy and Glossy icon styles
The generator and stencils for the fancy and glossy launcher icon
styles don't match the icon guidelines, so disable them for now until
we have new stencils for alternate shapes etc that also matches the
recommended style.
Change-Id: I17402309467348738b3582d0501ca93d4fed9673
Tor Norbye [Wed, 7 Sep 2011 18:28:54 +0000 (11:28 -0700)]
Cherrypick 4cd282 from master. do not merge.
Grid Layout and Convert to Grid Layout improvements
First, some improvements to Grid Layout handling:
(1) When dropping a new widget, look up the sizing metadata and use it
to determine what fill gravity to set. For example, a button will
use gravity left, and a text field will use gravity
fill_horizontal.
(2) Don't warn about reflection problems when failing to find
GridLayout layout data; this probably means the layout is being
attempted opened in an unsupporting SDK. There's a fallback case
to compute the data instead already.
Second, improvements to the conversion to GridLayout handling:
(1) It now looks at the layout_gravity values to see whether each row
and column is flexible, and if there's no flexible column in each
of the horizontal and vertical dimensions, it will insert a
special <Space> element to absorb any available extra space. This
avoids constraints warnings from GridLayout.
(2) It treats layout_width or layout_height attributes of match_parent
or fill_parent as the same as a fill gravity (and removes it) and
uses this in the flexibility computation above.
(3) It removes unsupported layout params for all children (earlier
this would only remove unsupported layout params on the direct
children of the layout, which isn't enough when a hierarchy is
being flattened.)
(4) It's smarter about computing implicit rows and columns, so it
avoids writing out redundant layout_row and layout_column
attributes in some cases.
(5) It avoids throwing refactoring errors in cases where an attribute
is removed twice
(6) Fixes a bug where the root layout was included when computing the
set of used x and y coordinates, which means you'd often end up
with a blank row and column 0.
(7) Various refactoring to make the code cleaner.
(8) More unit tests and updates to existing unit tests to reflect the
new behavior such as an absorbing spacer and removal of redundant
attributes.
Change-Id: Ifaca43458a4961fa032dfe22dc033b6def3c38d3
Tor Norbye [Tue, 27 Sep 2011 15:59:15 +0000 (08:59 -0700)]
Cherrypick e92f81 from master. do not merge.
Update eclipse/changes.txt
Change-Id: I7870b939c9276e112e0754e2ad18a6fd6f2b1236
Tor Norbye [Wed, 28 Sep 2011 17:30:22 +0000 (10:30 -0700)]
Cherrypick f37031 from master. do not merge.
Clarify SDK loading message
When SDKs are still loading there is a "please wait" message in the
status window. It would say "The project target (Android 2.3) ..."
when loading rendering targets, which was a bit confusing. The message
will now say "project target" when loading the target that is the
current project target, and otherwise the "rendering target".
Also change the refresh message to just say "The layout will refresh"
instead of mentioning it by name since when the layout name is
lowercase (as it usually is) the sentence begins with a lowercase
letter which looks a bit wrong (and besides there is no ambiguity
about which layout is going to be reloaded).
Change-Id: I8d6a456c2c8ba5fe539d07eef1f5a017c9b8454a
Roman Nurik [Wed, 28 Sep 2011 23:15:34 +0000 (16:15 -0700)]
Cherrypick 025af8 from master. do not merge.
Update Asset Studio launcher icon stencils per UX spec
Per discussion with the Android UX team, we've decided to update the
spec for launcher icons. In a future update we will change some of
the underlying behavior to provide more shapes and allow freeform
shapes.
Change-Id: I8dcdd5884d093fd4a7713c5796dd2dc83784be83
Siva Velusamy [Thu, 29 Sep 2011 19:53:45 +0000 (12:53 -0700)]
Cherry-Pick 3543c3 from master. do not merge.
Use a text box instead of a browser in tooltip area.
Change-Id: I8c6969c9efda7aca3b77c3ca739463cd695b6c82
Siva Velusamy [Thu, 29 Sep 2011 19:26:48 +0000 (12:26 -0700)]
Cherrypick 25f755 from master. do not merge.
Display tooltips only for long messages.
Currently, the tooltips are displayed for all logcat messages.
This patch makes them show up only if the logcat messages are longer
than the width of the column in which they are displayed, i.e.,
tooltips will be displayed only for those messages that could be clipped.
Change-Id: Iade7f6628a93a9344b337e45b957ca53e6fa4595
Daniel Sandler [Thu, 29 Sep 2011 14:37:08 +0000 (10:37 -0400)]
Cherrypick 88a0c4 from master. do not merge.
Nyandroid icon for the logcat Eclipse view.
Bug:
5390877
Change-Id: I945ed2854e6b405f9f851f5444312d7bfa56f54c
Xavier Ducrohet [Thu, 29 Sep 2011 17:59:40 +0000 (10:59 -0700)]
Merge 440fea from master. do not merge.
Don't add Android referenced project to library output.
The jar file output of a library can receive compiled code
from referenced Java projects but if the project is an Android
project then we ignore it. This is probably a bad setup anyway.
Change-Id: Idc1ec531a14c9f91beed26c4084b3956c3999930
Xavier Ducrohet [Thu, 29 Sep 2011 01:26:54 +0000 (18:26 -0700)]
Cherrypick 78c89f from master. do not merge.
Also process and cache the png files in libraries.
The png in the libraries were not processed by the crunch step.
Because aapt never processes png files anymore (relying on the crunch
step to do it), the png files in libraries were never processed.
While this is less a problem for standard png files, this completely
breaks 9-patches that must be processed to actually behaves as 9-patch.
Change-Id: I1d9e32e2c0409ec779150de0ad897e210a9be524
Siva Velusamy [Thu, 29 Sep 2011 01:42:10 +0000 (18:42 -0700)]
Cherrypick 09aefc from master. do not merge.
Check for scrolling before refreshing the table.
Change-Id: I14e596a79120284b0c1b8e4bc23439b10a37c2ff
Xavier Ducrohet [Thu, 15 Sep 2011 23:14:02 +0000 (16:14 -0700)]
Cherrypick 0a6192 from master. do not merge.
Add support to make identity files from the command line.
Change-Id: Ieb11a6ac46790f244786a20ede930768946abc91
Xavier Ducrohet [Wed, 21 Sep 2011 01:56:26 +0000 (18:56 -0700)]
Cherrypick 9dd123 from master. do not merge.
Fix migration to new library projects.
Also fixed a minor NPE.
Change-Id: Ie76f0120c63b37579b57b32b3b4af005f388a0b0
Raphael [Wed, 28 Sep 2011 01:27:32 +0000 (18:27 -0700)]
Merge "SDK repository: support for source packages. Do not merge." into tools_r14
Raphael [Tue, 27 Sep 2011 20:42:27 +0000 (13:42 -0700)]
SDK repository: support for source packages. Do not merge.
(cherry picked from commit
d963b52229e2d1a3875698e5d2822f00df3485c9)
Change-Id: I249fafe24795b94294c9f9251713c1028a3d9199
Xavier Ducrohet [Tue, 27 Sep 2011 23:41:35 +0000 (16:41 -0700)]
Tools r14 require ADT 14.
Change-Id: If07afb667f0b748e859e2e8b70aa1bcc74f0acfe
Tor Norbye [Mon, 26 Sep 2011 21:11:22 +0000 (14:11 -0700)]
Welcome Wizard tweaks. Do not merge.
Use Yes/No radio buttons in the Usage Statistic page rather than a
checkbox, and validate that one of the options are chosen such that
the Finish button on page 1 is not enabled.
Also add the Android icon to the wizard.
(cherry picked from commit
f5368be1b6cd95fd0ff065a1c624d812b8a260dd)
Change-Id: I4950f33921ba99ac4ec657adb477395c1cda0a07
Raphael [Mon, 26 Sep 2011 20:33:50 +0000 (13:33 -0700)]
Change welcome wizard string. Do not merge.
(cherry picked from commit
1632530362278dd0f0613bb0e7cfc67240cbaf59)
Change-Id: Iabfdc90a6941ffb62adc061af9d4cf5e24505e8e
Raphael [Sat, 24 Sep 2011 05:20:51 +0000 (22:20 -0700)]
Welcome wizard: validate when install common checkbox changed. Do not merge.
(cherry picked from commit
9e0c3a1110b123bd67befc1dd21a56c5f4bcd5ec)
Change-Id: I0e202549e7b8410bf4fe9c71e872cc3ad1d2fa30
Raphael [Sat, 24 Sep 2011 05:17:19 +0000 (22:17 -0700)]
Prevent new install of tools from displaying update msg. Do not merge.
(cherry picked from commit
2a94ac98f9079e083ca88037b38244b5b5a46d7f)
Change-Id: Iee30e19c591cb375104fbcbeb3474c52a47df465
Raphael [Sat, 24 Sep 2011 04:27:14 +0000 (21:27 -0700)]
First time install: multiple platforms, fix shell disposed. Do not merge.
Fixes for the first time install support:
- Support installing more than one platform.
The custom install task was tailored before to one
install a single package and return one status with
on archive install path. This has been made more
generic.
- Fix a couple occurences of the dreaded "SWT Shell disposed"
error that happen when updating the progress bar and closing
the window at the same time. The issue is that I was checking
isDisposed before starting a syncExec but the window can be
closed between the moment the syncExec is schedule and when it
happens so code must check again for isDisposed inside the
syncExec.
(cherry picked from commit
949dc34d6202ec5e318c30992bc11b61e0c64808)
Change-Id: I08976f2fcbba68f5371e410ffe8c741c1fa2c2dd
Tor Norbye [Wed, 21 Sep 2011 22:12:08 +0000 (15:12 -0700)]
Welcome Wizard. Do not merge.
This changeset adds a new "Welcome Wizard" which is shown the first
time a user runs Eclipse with the ADT plugin.
The welcome wizard asks for two pieces of information:
(1) The location of the SDK.
(2) Whether the user agrees to gathering usage statistics.
We've needed this information before, but collection of the data had
been more ad-hoc: The usage data permission dialog would show up on
its own, and the SDK information would be requested the first time
some code path touched it (e.g. opening a layout or opening the
preference dialog's Android page etc).
In addition, the wizard also offers to *install* SDKs if you don't
already have one. It gives the option between the latest available
platform, and one supported by a large majority of devices (currently
API level 7), or both. If you select this option, then when finishing
the wizard the SDK manager is run in a special mode where it installs
the required packages with a progress dialog.
This changeset also starts recording the chosen SDK location in the
~/.android settings file. This allows us to detect when you're running
Eclipse in a brand new workspace and you've already gone through the
SDK selection before, and we don't need to ask again -- we'll just use
the most recently known location.
The wizard will only be shown once. If you bypass or cancel out of the
wizard, you can still configure your SDK the old way - via the
Preference dialog. Note also that the usage permission page is only
shown if the user has not already opted in via say ddms.
NOTE: If you want to test this, make sure you haven't set the
environment variable ADT_TEST_SDK_PATH (as some of us do for running
unit tests) since it is treated as the user having selected the given
SDK root, and in particular it means the wizard won't be shown even if
you've wiped adtUsed=true from your ~/.android/ddms.cfg etc.
(cherry picked from commit
292eefb8faa2f75ddbc5d6e20084c9f9a762da29)
Change-Id: Idb3f8775ef62a84905cde95b25eeb8691ef0afab
Raphael [Sat, 24 Sep 2011 19:24:22 +0000 (12:24 -0700)]
Merge "Fix ADT build. Do not merge." into tools_r14
Raphael [Sat, 24 Sep 2011 19:24:12 +0000 (12:24 -0700)]
Merge "Address some comments on the DdmsPreferenceStore. Do not merge." into tools_r14
Raphael [Sat, 24 Sep 2011 19:24:04 +0000 (12:24 -0700)]
Merge "SDK: Fix traceview build. Do not merge." into tools_r14
Raphael [Sat, 24 Sep 2011 19:23:56 +0000 (12:23 -0700)]
Merge "Tweak AdtUpdater dialog to install a fresh new SDK. Do not merge." into tools_r14
Raphael [Sat, 24 Sep 2011 19:23:41 +0000 (12:23 -0700)]
Merge "Extract DDMS PreferenceStore. Do not merge." into tools_r14
Xavier Ducrohet [Fri, 23 Sep 2011 22:24:47 +0000 (15:24 -0700)]
Merge
b927e75 from master. do not merge.
When creating AVDs, check ABI before prompting for hw config.
The check verifies the number of available ABIs and the presence
of the --abi option (required if 2+ ABIs).
This avoid going through all the hardware config to then get an error
because --abi is missing.
Change-Id: I1c69dec3f2262e5faa8ce8a2d53d01fcafe8a20d
Raphael [Fri, 23 Sep 2011 19:13:49 +0000 (12:13 -0700)]
Fix ADT build. Do not merge.
(cherry picked from commit
c75ae5bac912229d8168efb91b117823959bc79d)
Change-Id: I14f62f892eac7168d38f787089525d989bf625e4
Raphael [Fri, 23 Sep 2011 18:00:59 +0000 (11:00 -0700)]
Address some comments on the DdmsPreferenceStore. Do not merge.
(cherry picked from commit
23e2f89139a9219136f5889ef1228b58bd9e02d6)
Change-Id: I65d7bed7a044d31376f592c7dcd9713a4b00262c
Raphael [Fri, 23 Sep 2011 18:12:57 +0000 (11:12 -0700)]
SDK: Fix traceview build. Do not merge.
(cherry picked from commit
f6c1a87ff7ddabe33ff8d29abb9ec0c0aa5633f6)
Change-Id: I254f0d6aba3513d759a6348580e7c1f670aa6d9e
Raphael [Fri, 23 Sep 2011 04:33:36 +0000 (21:33 -0700)]
Tweak AdtUpdater dialog to install a fresh new SDK. Do not merge.
(cherry picked from commit
4366a4e8145df82dd570d0c9f2b1c3c4301166a1)
Change-Id: I23f4504a5239592db211d5436c252b957ba68503
Raphael [Thu, 22 Sep 2011 22:27:35 +0000 (15:27 -0700)]
Extract DDMS PreferenceStore. Do not merge.
Splits DDMS PreferenceStore management in
a separate class and add the methods we need
for ADT first-time wizard.
Various pieces of DDMS access the pref store
via the PrefsDialog. This could use a cleanup
eventually later.
(cherry picked from commit
f7bc23a0f19d2e3371cbea41d4cf8a1081c9d2d8)
Change-Id: Iac37f970e69b7d74d9dd15120b838bcc47ba1caa
Xavier Ducrohet [Fri, 23 Sep 2011 19:43:41 +0000 (12:43 -0700)]
CherryPick 67000f from master. do not merge.
Fix ADT builder to use the modified ApkBuilder api.
Change-Id: Id73c5994748187396d3d9cd21dff3c2efa377504
Xavier Ducrohet [Fri, 23 Sep 2011 17:53:31 +0000 (10:53 -0700)]
CherryPick 2c8cce from master. do not merge.
Fix dependency support for aild.
The aidl task doesn't use InputPath so it fails to
check files for modifications.
Change-Id: I1000c0fad69791461e8021a95214d044fad71674
Xavier Ducrohet [Fri, 23 Sep 2011 02:14:22 +0000 (19:14 -0700)]
CherryPick 15fa2c from master. do not merge.
Make the zip align ant step check timestamp on intput/output.
If the output is more recent than the input, zipalign does nothing.
Change-Id: I51146f0da9697e8f8bfc19e4d6bea80006f101b5
Xavier Ducrohet [Fri, 2 Sep 2011 01:27:32 +0000 (18:27 -0700)]
CherryPick a9a282 from master. do not merge.
Add dependency support for ApkBuilder ant step.
Change-Id: Ia51f745f3bb0a91bafe0396804b999a0e39578ea
Raphael [Wed, 21 Sep 2011 22:17:50 +0000 (15:17 -0700)]
Display the full error info for broken packages. DO NOT MERGE.
The BrokenPackage contains a "long description" that
contains the error (why it is broken). We need to use
that and not override it with the base package
description.
(cherry picked from commit
53c2f0ce0dfac607c6ff3b6350b61ba134cd7eeb)
Change-Id: I6a1f1e7047ca8d37ec7c62325d1cd1d2248f6b9f
Tor Norbye [Wed, 21 Sep 2011 16:41:07 +0000 (09:41 -0700)]
Bug fixes for render target selection and project combo
This changeset fixes two bugs:
(1) Make sure that the default render target chosen for a newly opened
layout is the same as the project build target, if the project
build target is a preview release.
(2) Ensure that the project selector combo updates its selection to
show the selected project when it is set (without this there were
scenarios where the New XML File dialog would not show the project
it had actually found and selected internally.
Change-Id: Ia9dd9d75e42f9e8b9d312fc0d951f798c578165f
Siva Velusamy [Tue, 20 Sep 2011 22:28:10 +0000 (15:28 -0700)]
Display stack trace for selected Heap Allocation.
Minor changes in a few other places to return List's instead of
arrays.
Change-Id: I25ddc25ebc1c91677d16e9d77dc0f8a51022bc1b
Siva Velusamy [Tue, 20 Sep 2011 19:18:54 +0000 (12:18 -0700)]
New implementation of native heap - layout only.
Address resolution to symbols to come in future CL's.
Siva Velusamy [Mon, 19 Sep 2011 18:51:40 +0000 (11:51 -0700)]
When requesting NHGT, disable NHSG.
NHGT = Native Heap GeT
NHSG = Native Heap Segment Data
Currently, ddmlib doesn't do much processing of the NHSG data anyway.
Adding NHSG causes a stream of segment data updates sent from the client,
which is then ignored.
Change-Id: Ifb95e9a744cd5c733593abb1bb83446796e7b50a
Siva Velusamy [Sat, 17 Sep 2011 23:19:13 +0000 (16:19 -0700)]
Use foreach instead of iterator
Change-Id: I06c3f52313ae06ff2b51cbe6b302409bd4efca5b
Raphael [Tue, 20 Sep 2011 07:07:07 +0000 (00:07 -0700)]
Fix ADT build.
Change-Id: Ibfa4d889a4194f9b285bc904b9913a811037c3de
Raphael Moll [Sun, 18 Sep 2011 05:10:19 +0000 (22:10 -0700)]
Merge "Enable SDK Repo to use latest XSD versions."
This requires development.git Change-Id If3beb09a to build.
Manual cherry-pick of
b889a8783158f156bc95ec3c63cccd60e210f1d1.
Apparently it wasn't auto-merged automatically.
Change-Id: I12f9da8e5348e8524294866f3e400110926e8317
Raphael Moll [Tue, 20 Sep 2011 03:36:32 +0000 (20:36 -0700)]
Merge "Build AVD Manager.exe as part of Windows SDK."
Raphael [Tue, 20 Sep 2011 03:36:21 +0000 (20:36 -0700)]
Merge "SDK: change way system image packages are loaded."
Xavier Ducrohet [Mon, 19 Sep 2011 23:41:05 +0000 (16:41 -0700)]
Merge "Make sure renderscript's -target-api receives 11+"
Raphael [Mon, 19 Sep 2011 22:01:36 +0000 (15:01 -0700)]
Merge "SDK Manager: Extract all source.properties constants."
Xavier Ducrohet [Sun, 18 Sep 2011 22:00:17 +0000 (15:00 -0700)]
Make sure renderscript's -target-api receives 11+
Change-Id: Id4012b8c86212b3874c0820ba9c71136083cd5f2
Raphael Moll [Sat, 17 Sep 2011 18:25:36 +0000 (11:25 -0700)]
Build AVD Manager.exe as part of Windows SDK.
Also make sure the sdk manager post install will
update the AVD Manager as required.
Change-Id: I969899adf69f0ed0ddb1ef079451683dd0ce567f
Raphael [Sun, 18 Sep 2011 22:21:50 +0000 (15:21 -0700)]
SDK: change way system image packages are loaded.
This change the system image packages to not care
about the directory name of where they are located
and instead enforce the presence of a source.properties
file.
Change-Id: I580a0c04a453297ae7ddf9de8e012fd65d34d776
Raphael [Sun, 18 Sep 2011 18:35:52 +0000 (11:35 -0700)]
SDK Manager: Extract all source.properties constants.
The SDK Manager uses specific constants to save
local source.properties files in installed packages.
This moves all these constants in a common constant
class and makes it explicit that these constants
form some kind of API that can't be changed arbitrarily.
Change-Id: I005f13f53768fbcc677edf94be0b4c13e19e3ec8
Raphael [Sun, 18 Sep 2011 04:43:32 +0000 (21:43 -0700)]
SDK Manager: tooltips on package table.
This adds tooltips to the package table.
The tooltip displays the long description of the
packages. This is especially useful from broken
packages (e.g. those that did not load correctly)
since it indicates what failed.
Change-Id: I6e53d0959d6dd056414e91d9a27393d989517bd8
Raphael [Fri, 16 Sep 2011 22:53:12 +0000 (15:53 -0700)]
Merge "Specify the full path to atree for the windows.atree"
Xavier Ducrohet [Fri, 16 Sep 2011 22:47:26 +0000 (15:47 -0700)]
Merge "Improve error message if manifest has wrong minSdkVersion."
Raphael [Fri, 16 Sep 2011 22:28:45 +0000 (15:28 -0700)]
Specify the full path to atree for the windows.atree
Somehow the build server doesn't automatically find atree.
In a future CL this should be amended to pass the proper
OUT_HOST_EXECUTABLE, being careful that it points to the
host/linux dir, not the current Windows one.
Change-Id: Ibb78a517c33d46454828a5932408108dadbee497
Xavier Ducrohet [Fri, 16 Sep 2011 21:02:09 +0000 (14:02 -0700)]
Improve error message if manifest has wrong minSdkVersion.
Change-Id: I00ceed502f0a756183198ebbe77da8f2e7fb303d
Raphael [Fri, 16 Sep 2011 20:03:15 +0000 (13:03 -0700)]
Merge "SDK Manager: make 'list sdk' ids deterministic."
Raphael [Fri, 16 Sep 2011 05:07:39 +0000 (22:07 -0700)]
SDK Manager: make 'list sdk' ids deterministic.
This changes 'android list sdk' to output deterministic
install IDs. These IDs can then be give to 'android update sdk'.
Example of usage:
$ android list sdk --extended
Refresh Sources: [...]
----------
id: 2 or "android-13"
Type: Platform
Desc: Android SDK Platform 3.2, revision 1
[...]
----------
id: 41 or "extra-google-usb_driver"
Type: Extra
Desc: USB Driver for Windows, revision 4
$ android update sdk --no-ui --filter android-13,extra-google-usb_driver
=> This installs the platform API 13 and the USB Driver.
SDK Bug: 19504
Change-Id: I3109c90371d292df4e9cf845208bf8efe774233f
Siva Velusamy [Fri, 16 Sep 2011 20:01:47 +0000 (13:01 -0700)]
Merge "Update year in copyright notices to 2011."
Xavier Ducrohet [Fri, 16 Sep 2011 19:40:36 +0000 (12:40 -0700)]
Merge "Pass -target-api to the renderscript compiler."
Siva Velusamy [Fri, 16 Sep 2011 19:04:34 +0000 (12:04 -0700)]
Update year in copyright notices to 2011.
Change-Id: Ibe1042437e4f320a034be176b0b8efc7d205f79b
Raphael [Fri, 16 Sep 2011 18:03:00 +0000 (11:03 -0700)]
Merge "Use atree for the Windows SDK. Strip binaries."
Raphael [Fri, 16 Sep 2011 16:18:08 +0000 (09:18 -0700)]
AVD Launcher.exe for the Windows SDK.
In Tools R14, the Windows SDK will have 2 icons in the root
of the SDK: one to launch the AVD window, and a different one
to launche the SDK Manager window.
I'll need to change the icon in a later CL. I don't have
any ICO editor at hand right now.
Change-Id: Ic651e3c3d71c2eac5fe851fba8ea2782eca5e594
Xavier Ducrohet [Fri, 16 Sep 2011 01:10:59 +0000 (18:10 -0700)]
Pass -target-api to the renderscript compiler.
This allows to use a single llvm executable to target
all API versions.
Change-Id: Ib27f7fc9e54c548d31fc98fc323f439cb99218d5
Raphael [Thu, 15 Sep 2011 20:58:17 +0000 (13:58 -0700)]
SDK Manager: fix reload issue.
From time to time the sdk manager wasn't properly
refreshing its list. This was due to its reload operation
not properly clearing the platform/addons targets listed
by the SdkManager instance. Clearing them forces the
LocalPackageParser to really reparse directories on disk.
Change-Id: I99bcb4a78749d673db5b1ec2436a1af7538e48ee
Raphael [Thu, 15 Sep 2011 04:11:30 +0000 (21:11 -0700)]
Use atree for the Windows SDK. Strip binaries.
This moves the copy/strip/rm logic for the Windows SDK
fro mthe patch_windows_sdk.sh to a regular tools.windows.atree.
The bash script is still here to invoke atree and do whatever
cleanup we might want to do later.
This should make it easier to maintain the Windows SDK
by providing a structure similar to tools.atree.
This change requires build.git Change-Id: I22aae7a8 to
have rm/strip support in atree.
Change-Id: Ie6c30979454fb71fc1cb26ab3f6c38acd47bae57
Brett Chabot [Thu, 15 Sep 2011 18:21:20 +0000 (11:21 -0700)]
Merge "Allow custom run name in IRemoteAndroidTestRunner."
Siva Velusamy [Thu, 15 Sep 2011 18:17:33 +0000 (11:17 -0700)]
Merge "Default HPROF dump action should be to save hprof file."
Brett Chabot [Thu, 15 Sep 2011 00:45:25 +0000 (17:45 -0700)]
Allow custom run name in IRemoteAndroidTestRunner.
Change-Id: I6a332ea16243f43d080e4d88e914d6b2e940ce97
Siva Velusamy [Thu, 15 Sep 2011 00:31:59 +0000 (17:31 -0700)]
Use default system font size.
And make sure that the default logcat table row height is high
enough for the currently used font.
Change-Id: Ibfabb05b92add42c6d0acb2b79668f93b833057f
Tor Norbye [Wed, 14 Sep 2011 23:28:47 +0000 (16:28 -0700)]
Merge "Fix SDK target selector to avoid horizontal scrollbar"
Tor Norbye [Wed, 14 Sep 2011 19:01:16 +0000 (12:01 -0700)]
Fix SDK target selector to avoid horizontal scrollbar
This changeset works around a Mac SWT issue where a checkbox table
will not take into account the size of the checkbox column, so you end
up with a horizontal scrollbar. To work around this, we compute the
size of checkboxes and subtract it from the available width when
distributing column sizes.
Change-Id: I9c03b987f57bc992487b67d24215134ae0d5b0b8
David Turner [Wed, 14 Sep 2011 13:32:31 +0000 (06:32 -0700)]
Merge "Copy OpenGLES emulation libraries to SDK installation."
Raphael [Wed, 14 Sep 2011 04:08:24 +0000 (21:08 -0700)]
Merge changes I74718caa,I5811c160
* changes:
SdkManager: double selection on tree viewer.
Tweak sdk manager progress bar.
Siva Velusamy [Wed, 14 Sep 2011 00:08:09 +0000 (17:08 -0700)]
Default HPROF dump action should be to save hprof file.
Change-Id: I3ade32621326456f030d9aaa581b011420fe4413
Tor Norbye [Tue, 13 Sep 2011 21:35:48 +0000 (14:35 -0700)]
Improve validation error messages when SDKs are loading
If you bring up the "Create New Sample Project" wizard in an Eclipse
that has no open editors (so nothing has triggered an SDK load yet),
you will get an error message that is a bit misleading (that the
selected SDK has no samples), and even when the SDK finishes loading
the validation isn't updated.
This changeset improves this situation such that there is a message
during loading stating to wait, which gets cleared once it's done.
Change-Id: I5d0798eff3b4fea9c8835c2f88c5bc430110aac0
Raphael [Tue, 13 Sep 2011 21:04:15 +0000 (14:04 -0700)]
SdkManager: double selection on tree viewer.
Change-Id: I74718caa48a59f132b6d37988625376c312bba27
Raphael [Tue, 13 Sep 2011 19:59:30 +0000 (12:59 -0700)]
Tweak sdk manager progress bar.
Change-Id: I5811c1601578a9e6e53d59f13ba469d2ce7d767f