OSDN Git Service
Roman Nurik [Thu, 29 Sep 2011 21:37:04 +0000 (14:37 -0700)]
am
d2213597: (-s ours) Cherrypick 025af8 from do not merge.
* commit '
d2213597a8f6adeb177d9ddf777112788261e527':
Cherrypick 025af8 from master. do not merge.
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 20:41:45 +0000 (13:41 -0700)]
am
e8201712: (-s ours) Cherry-Pick 3543c3 from do not merge.
* commit '
e8201712bbfd6aaad00c36e41bfd93e7428f47db':
Cherry-Pick 3543c3 from master. do not merge.
Siva Velusamy [Thu, 29 Sep 2011 20:41:35 +0000 (13:41 -0700)]
am
82b6fbd0: (-s ours) Cherrypick 25f755 from do not merge.
* commit '
82b6fbd067b06382da9c69e79c56915e608bf99f':
Cherrypick 25f755 from master. do not merge.
Daniel Sandler [Thu, 29 Sep 2011 20:41:34 +0000 (13:41 -0700)]
am
048a3637: (-s ours) Cherrypick 88a0c4 from do not merge.
* commit '
048a363719a6c9020135843036fef4b5ad37356f':
Cherrypick 88a0c4 from master. do not merge.
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
Tor Norbye [Thu, 29 Sep 2011 20:27:20 +0000 (13:27 -0700)]
Merge "Find non-constant expr errors and offer migration explanation"
Siva Velusamy [Thu, 29 Sep 2011 20:01:09 +0000 (13:01 -0700)]
Merge "Use a text box instead of a browser in tooltip area."
Siva Velusamy [Thu, 29 Sep 2011 19:55:34 +0000 (12:55 -0700)]
Merge "Display tooltips only for long messages."
Siva Velusamy [Thu, 29 Sep 2011 19:53:45 +0000 (12:53 -0700)]
Use a text box instead of a browser in tooltip area.
Change-Id: Ica610ef4cefffaef3b6404a425c8b4551e741676
Daniel Sandler [Thu, 29 Sep 2011 19:53:13 +0000 (12:53 -0700)]
Merge "Nyandroid icon for the logcat Eclipse view."
Siva Velusamy [Thu, 29 Sep 2011 19:26:48 +0000 (12:26 -0700)]
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: Ib5bbce7d055656d2cc8063efdf5fed5910b24ad0
Xavier Ducrohet [Thu, 29 Sep 2011 18:42:10 +0000 (11:42 -0700)]
am
2bd58150: (-s ours) Merge 440fea from do not merge.
* commit '
2bd58150cdac3603552241fe70a73388e7094670':
Merge 440fea from master. do not merge.
Xavier Ducrohet [Thu, 29 Sep 2011 18:42:09 +0000 (11:42 -0700)]
am
4348dca9: (-s ours) Cherrypick 78c89f from do not merge.
* commit '
4348dca9124f42af3ac3a6372831fcab66e99c52':
Cherrypick 78c89f from master. do not merge.
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
Tor Norbye [Wed, 28 Sep 2011 14:42:38 +0000 (07:42 -0700)]
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: Ia90cdf308db87d31c1e6a663613d4cfd0bf675dc
Xavier Ducrohet [Thu, 29 Sep 2011 18:31:15 +0000 (11:31 -0700)]
Merge "Don't add Android referenced project to library output."
Xavier Ducrohet [Thu, 29 Sep 2011 18:31:10 +0000 (11:31 -0700)]
Merge "Also process and cache the png files in libraries."
Tor Norbye [Thu, 29 Sep 2011 18:25:13 +0000 (11:25 -0700)]
Merge "Grid Layout and Convert to Grid Layout improvements"
Tor Norbye [Thu, 29 Sep 2011 18:25:07 +0000 (11:25 -0700)]
Merge "Remove the Fancy and Glossy icon styles"
Xavier Ducrohet [Thu, 29 Sep 2011 17:59:40 +0000 (10:59 -0700)]
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: I6432d4704c2357c64e2c9597eea75328695ff822
Siva Velusamy [Thu, 29 Sep 2011 16:42:01 +0000 (09:42 -0700)]
am
a4790d7a: (-s ours) Cherrypick 09aefc from do not merge.
* commit '
a4790d7a523cc7c4eecb1fab2ba0fe9da18a9042':
Cherrypick 09aefc from master. do not merge.
Daniel Sandler [Thu, 29 Sep 2011 14:37:08 +0000 (10:37 -0400)]
Nyandroid icon for the logcat Eclipse view.
Bug:
5390877
Change-Id: I81e77cf57a358e6c0583d592d104a93475ab37ae
Xavier Ducrohet [Thu, 29 Sep 2011 01:26:54 +0000 (18:26 -0700)]
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: I0a1fe14ea34f6d36a368b456494410945afc3c44
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
Siva Velusamy [Thu, 29 Sep 2011 01:42:10 +0000 (18:42 -0700)]
Check for scrolling before refreshing the table.
Change-Id: Id65b11216a8240e3297072f0af094d69d924a8b3
Tor Norbye [Wed, 28 Sep 2011 23:32:23 +0000 (16:32 -0700)]
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: I521c3c645dee4bc1766e24cf49ee49f19d66ee6f
Roman Nurik [Wed, 28 Sep 2011 23:21:08 +0000 (16:21 -0700)]
Merge "Update Asset Studio launcher icon stencils per UX spec"
Roman Nurik [Wed, 28 Sep 2011 23:15:34 +0000 (16:15 -0700)]
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: Idf575230c7c649299c7368209dfee5e7a0638fad
Tor Norbye [Wed, 7 Sep 2011 18:28:54 +0000 (11:28 -0700)]
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: Iee44c3ca749eefc107b83545669cc9d7f84615b1
Xavier Ducrohet [Wed, 28 Sep 2011 21:10:28 +0000 (14:10 -0700)]
am
981fb61d: (-s ours) Cherrypick 0a6192 from do not merge.
* commit '
981fb61d258d58d91a98734ffcfa7242ded90632':
Cherrypick 0a6192 from master. do not merge.
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
Tor Norbye [Wed, 28 Sep 2011 19:17:57 +0000 (12:17 -0700)]
Merge "Clarify SDK loading message"
Tor Norbye [Wed, 28 Sep 2011 17:30:22 +0000 (10:30 -0700)]
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: I2497ba3a35289e9c3f37021cd8a17983e18146cb
Xavier Ducrohet [Wed, 28 Sep 2011 18:11:53 +0000 (11:11 -0700)]
am
8760c8e3: (-s ours) Cherrypick 9dd123 from do not merge.
* commit '
8760c8e3ad680c4bcba25701eea2fd3b403db055':
Cherrypick 9dd123 from master. do not merge.
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
Siva Velusamy [Wed, 28 Sep 2011 00:29:37 +0000 (17:29 -0700)]
Add support for exporting heap data.
Change-Id: Ica8de494934195f30b75b8295d0908e3aacdefff
Siva Velusamy [Tue, 27 Sep 2011 23:08:52 +0000 (16:08 -0700)]
Add support for Select All & Copy Paste.
Change-Id: I4b41b6ee5a7a5600ca3b37d3addf1dce7d1e072a
Siva Velusamy [Tue, 27 Sep 2011 21:44:50 +0000 (14:44 -0700)]
Construct NativeStackCallInfo with full symbol address.
Addr2line constructs NativeStackCallInfo for a symbol using its
offset within the library as the address. This patch is a minor change
to make it use the address in the executable instead of the offset
in the library.
Change-Id: I3e3e960f6c5abefac83b670e3ab23a78c57a8e56
Siva Velusamy [Wed, 28 Sep 2011 03:59:22 +0000 (20:59 -0700)]
Merge "Check for relevant stack frame using source library."
Siva Velusamy [Wed, 28 Sep 2011 03:56:00 +0000 (20:56 -0700)]
Merge "Update default addr2line to use."
Xavier Ducrohet [Wed, 28 Sep 2011 01:53:38 +0000 (18:53 -0700)]
Merge "Fix migration to new library projects."
Raphael [Wed, 28 Sep 2011 01:28:44 +0000 (18:28 -0700)]
am
794cb8d0: (-s ours) Merge "SDK repository: support for source packages. Do not merge." into tools_r14
* commit '
794cb8d02a94610dda1ebef5f0d72fef345b3894':
SDK repository: support for source packages. Do not merge.
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
Xavier Ducrohet [Wed, 21 Sep 2011 01:56:26 +0000 (18:56 -0700)]
Fix migration to new library projects.
Also fixed a minor NPE.
Change-Id: Ide127e3b9a0aeb1b8468d3f4b973f1ee5a27851d
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
Raphael [Tue, 27 Sep 2011 23:57:00 +0000 (16:57 -0700)]
Merge "SDK repository: support for source packages."
Xavier Ducrohet [Tue, 27 Sep 2011 23:47:24 +0000 (16:47 -0700)]
am
a1760eb0: Tools r14 require ADT 14.
* commit '
a1760eb02098b21f1aa37a293a488a1ab4bdb823':
Tools r14 require ADT 14.
Xavier Ducrohet [Tue, 27 Sep 2011 23:41:35 +0000 (16:41 -0700)]
Tools r14 require ADT 14.
Change-Id: If07afb667f0b748e859e2e8b70aa1bcc74f0acfe
Raphael [Tue, 27 Sep 2011 20:42:27 +0000 (13:42 -0700)]
SDK repository: support for source packages.
Change-Id: Ib8df984ddbad0bb6f0eb4c2fb0bd4b9c49b334cc
Siva Velusamy [Mon, 26 Sep 2011 20:53:51 +0000 (13:53 -0700)]
Check for relevant stack frame using source library.
In a stack trace, skip all frames from libc and from methods matching
malloc/realloc/calloc etc to identify the source frame where heap memory
is allocated.
Change-Id: Ia8661c7ff58b3db502c92b2f48819c3219861a73
Siva Velusamy [Mon, 26 Sep 2011 18:21:31 +0000 (11:21 -0700)]
Update default addr2line to use.
Change-Id: I17a1b29039e50e0256f37519b3fd8781b88f5e39
Tor Norbye [Tue, 27 Sep 2011 15:59:15 +0000 (08:59 -0700)]
Update eclipse/changes.txt
Change-Id: I578e5c6f2197ad445894301fbc8c3780579ae8bc
Tor Norbye [Mon, 26 Sep 2011 22:18:25 +0000 (15:18 -0700)]
Tweak usage panel message
Change-Id: I99a2953f11e63f6646133c4727880487fe65f0d8
Tor Norbye [Mon, 26 Sep 2011 22:06:00 +0000 (15:06 -0700)]
am
3d73f98d: (-s ours) Welcome Wizard tweaks. Do not merge.
* commit '
3d73f98d6ac275a01b3b88adf83b825cd70c986b':
Welcome Wizard tweaks. Do not merge.
Raphael [Mon, 26 Sep 2011 22:06:00 +0000 (15:06 -0700)]
am
0d48d0b6: (-s ours) Change welcome wizard string. Do not merge.
* commit '
0d48d0b6481cd642d2eb9652c2b8b898e9b0e784':
Change welcome wizard string. Do not merge.
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
Tor Norbye [Mon, 26 Sep 2011 21:11:22 +0000 (14:11 -0700)]
Welcome Wizard tweaks
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.
Change-Id: Ia8a7593883a7a6cb4126e644cc627edae77757ec
Raphael [Mon, 26 Sep 2011 20:33:50 +0000 (13:33 -0700)]
Change welcome wizard string
Change-Id: I4f900bb20f6a55a44a2f61231524b82d9f96c9ee
Raphael [Mon, 26 Sep 2011 17:01:55 +0000 (10:01 -0700)]
am
a2091e03: (-s ours) Welcome wizard: validate when install common checkbox changed. Do not merge.
* commit '
a2091e03dd8440aed3ab3618befc67162d7bbedf':
Welcome wizard: validate when install common checkbox changed. Do not merge.
Raphael [Mon, 26 Sep 2011 17:01:53 +0000 (10:01 -0700)]
am
a2fc0466: (-s ours) Prevent new install of tools from displaying update msg. Do not merge.
* commit '
a2fc0466f6d784ab31306e4572a8af14fa5b2734':
Prevent new install of tools from displaying update msg. Do not merge.
Raphael [Mon, 26 Sep 2011 17:01:53 +0000 (10:01 -0700)]
am
84cbb7df: (-s ours) First time install: multiple platforms, fix shell disposed. Do not merge.
* commit '
84cbb7dfc89081b1c3429ed8c3568977cc354cd1':
First time install: multiple platforms, fix shell disposed. Do not merge.
Tor Norbye [Mon, 26 Sep 2011 17:01:52 +0000 (10:01 -0700)]
am
d0357c27: (-s ours) Welcome Wizard. Do not merge.
* commit '
d0357c27e602d6bec239897b8375d642bc590a62':
Welcome Wizard. Do not merge.
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 22:28:49 +0000 (15:28 -0700)]
Merge "Welcome wizard: validate when install common checkbox changed."
Raphael [Sat, 24 Sep 2011 22:27:06 +0000 (15:27 -0700)]
Merge "Prevent new install of tools from displaying update msg."
Raphael [Sat, 24 Sep 2011 22:26:47 +0000 (15:26 -0700)]
Merge "First time install: multiple platforms, fix shell disposed."
Raphael [Sat, 24 Sep 2011 19:25:44 +0000 (12:25 -0700)]
am
082f833d: (-s ours) Merge "Fix ADT build. Do not merge." into tools_r14
* commit '
082f833d2eed8e6cb6e4e75a273f76b796902133':
Fix ADT build. Do not merge.
Raphael [Sat, 24 Sep 2011 19:24:39 +0000 (12:24 -0700)]
am
f7078fc8: (-s ours) Merge "Address some comments on the DdmsPreferenceStore. Do not merge." into tools_r14
* commit '
f7078fc825eed703af147ff8573d4ddeb47d35bb':
Address some comments on the DdmsPreferenceStore. Do not merge.
Raphael [Sat, 24 Sep 2011 19:24:38 +0000 (12:24 -0700)]
am
39da114d: (-s ours) Merge "SDK: Fix traceview build. Do not merge." into tools_r14
* commit '
39da114da748ccf6c03e6766e0a8245333b49422':
SDK: Fix traceview build. Do not merge.
Raphael [Sat, 24 Sep 2011 19:24:38 +0000 (12:24 -0700)]
am
2acdb04f: (-s ours) Merge "Tweak AdtUpdater dialog to install a fresh new SDK. Do not merge." into tools_r14
* commit '
2acdb04f2841b9983151802196ef5e09a6a37c3e':
Tweak AdtUpdater dialog to install a fresh new SDK. Do not merge.
Raphael [Sat, 24 Sep 2011 19:24:37 +0000 (12:24 -0700)]
am
ba0575d0: (-s ours) Merge "Extract DDMS PreferenceStore. Do not merge." into tools_r14
* commit '
ba0575d0156a888ec41d380a87d418969f0bd4e5':
Extract DDMS PreferenceStore. Do not merge.
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
Raphael [Sat, 24 Sep 2011 05:20:51 +0000 (22:20 -0700)]
Welcome wizard: validate when install common checkbox changed.
Change-Id: I8de07ed1b551d1b458d551c15a15551a4e890889
Raphael [Sat, 24 Sep 2011 05:17:19 +0000 (22:17 -0700)]
Prevent new install of tools from displaying update msg.
Change-Id: Id9cacdc53e2e800526950480007e0a8f474779be
Raphael [Sat, 24 Sep 2011 04:27:14 +0000 (21:27 -0700)]
First time install: multiple platforms, fix shell disposed.
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.
Change-Id: I413cfacd63406febc7953effad5ece2ef2854360
Siva Velusamy [Fri, 23 Sep 2011 23:51:10 +0000 (16:51 -0700)]
Merge "Append prefix "Z" only for Zygote allocations."
Siva Velusamy [Fri, 23 Sep 2011 23:51:06 +0000 (16:51 -0700)]
Merge "Provide ability to view just the new allocations."
Siva Velusamy [Fri, 23 Sep 2011 23:50:58 +0000 (16:50 -0700)]
Merge "Override hashCode."
Xavier Ducrohet [Fri, 23 Sep 2011 23:49:37 +0000 (16:49 -0700)]
am
ef33cfce: (-s ours) Merge
b927e75 from do not merge.
* commit '
ef33cfcef8082b20df0263101c4cef7d76e4102b':
Merge
b927e75 from master. do not merge.
Siva Velusamy [Fri, 23 Sep 2011 23:24:19 +0000 (16:24 -0700)]
Append prefix "Z" only for Zygote allocations.
Cross checked with vendor/google/tools/nativeheapdump and made sure
that output of both tools match.
Change-Id: I129791ec42e7c0f4197fd59f687477b3d82e4d20
Siva Velusamy [Fri, 23 Sep 2011 18:07:25 +0000 (11:07 -0700)]
Provide ability to view just the new allocations.
Rather than viewing the entire snapshot, users can now view
just the allocations that have happened since the previous
snapshot.
Change-Id: I6115fdcd3928db775d8b77c078c9fce2539779ac
Siva Velusamy [Fri, 23 Sep 2011 16:47:16 +0000 (09:47 -0700)]
Override hashCode.
equals() was overridden previously, but not hashCode.
Change-Id: I82371f853f1ab23b081ed78fc54f5e66ecccbe3e
Tor Norbye [Fri, 23 Sep 2011 23:09:18 +0000 (16:09 -0700)]
Merge "Welcome Wizard"
Tor Norbye [Wed, 21 Sep 2011 22:12:08 +0000 (15:12 -0700)]
Welcome Wizard
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.
Change-Id: I0a4e2c4efce84aca9beae394ce67e4c145cbb000
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
Xavier Ducrohet [Fri, 23 Sep 2011 22:24:47 +0000 (15:24 -0700)]
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: I64fefc73f4cb3d9a420309ad1850fa6c30f70e0d
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