OSDN Git Service
Tor Norbye [Fri, 2 Sep 2011 17:31:43 +0000 (10:31 -0700)]
Merge "Add support for remaining asset types in Asset Studio Wizard"
Tor Norbye [Fri, 2 Sep 2011 17:30:00 +0000 (10:30 -0700)]
Merge "A few warnings fixes"
Tor Norbye [Fri, 2 Sep 2011 17:29:08 +0000 (10:29 -0700)]
Merge "Fix NPE in ResourceFolder when deleting folders"
Brett Chabot [Fri, 2 Sep 2011 16:05:58 +0000 (09:05 -0700)]
Merge "Fix junit reported error in SdkManagerTestCase."
Raphael Moll [Fri, 2 Sep 2011 04:37:05 +0000 (21:37 -0700)]
Merge "SDK Manager: allow manual install of incompatible archives."
Raphael Moll [Fri, 2 Sep 2011 04:36:57 +0000 (21:36 -0700)]
Merge "Unit test for XML with <extra old-path> attribute."
Raphael Moll [Fri, 2 Sep 2011 04:36:46 +0000 (21:36 -0700)]
Merge "Repository XSD: System Images Packages."
Raphael Moll [Fri, 2 Sep 2011 04:36:38 +0000 (21:36 -0700)]
Merge "Test ExtraPackage old_path in SDK Manager diff"
Raphael Moll [Fri, 2 Sep 2011 04:36:17 +0000 (21:36 -0700)]
Merge "SDK Manager: Unit tests for ArchiveInstaller."
Raphael Moll [Fri, 2 Sep 2011 04:36:05 +0000 (21:36 -0700)]
Merge "SDK Manager: remember window positions."
Raphael Moll [Fri, 2 Sep 2011 04:35:57 +0000 (21:35 -0700)]
Merge "Move ant project templates files to development.git"
Raphael Moll [Fri, 2 Sep 2011 04:35:47 +0000 (21:35 -0700)]
Merge "Repository XSD: New <old_paths> in Extra packages."
Raphael Moll [Fri, 2 Sep 2011 04:35:36 +0000 (21:35 -0700)]
Merge "Windows: look for Java in %ProgramFiles(x86)%."
Raphael Moll [Fri, 2 Sep 2011 04:35:29 +0000 (21:35 -0700)]
Merge "sdkman2: don't select Win USB driver on Mac/Linux."
Brett Chabot [Thu, 1 Sep 2011 23:43:33 +0000 (16:43 -0700)]
Merge "Add layoutlib_api.jar to sdk/tests/libtests."
Brett Chabot [Thu, 1 Sep 2011 23:29:55 +0000 (16:29 -0700)]
Add layoutlib_api.jar to sdk/tests/libtests.
Bug
5249969
Change-Id: I47c8672da6ab40a9ecb9e5e64b42d5f5f8924381
Brett Chabot [Thu, 1 Sep 2011 23:16:35 +0000 (16:16 -0700)]
Fix junit reported error in SdkManagerTestCase.
Bug
5250175
Change-Id: I101991158231b70e203d701f0db0c6972e305a66
Xavier Ducrohet [Thu, 1 Sep 2011 22:44:41 +0000 (15:44 -0700)]
Merge "Add proper dependency support in the dex step of the Ant-based build."
Xavier Ducrohet [Thu, 1 Sep 2011 22:44:31 +0000 (15:44 -0700)]
Merge "Add support for proper dependency detection in the aidl ant compilation step."
Xavier Ducrohet [Fri, 26 Aug 2011 01:36:48 +0000 (18:36 -0700)]
Add proper dependency support in the dex step of the Ant-based build.
The dex step now generates a dependency file that is reused during
following builds to check whether dex should occur.
Also optimized the part that figures out if any dependencies have
been modified/have gone missing.
Change-Id: I7f6e915fc7b571ad973260daa506badced3a9c2a
Xavier Ducrohet [Tue, 23 Aug 2011 17:18:17 +0000 (10:18 -0700)]
Add support for proper dependency detection in the aidl ant compilation step.
Aidl compilation now generates dependency files that are reused on further
compilations to only recompile files that needs it based on source files
modifications.
Also clean up output (and dependency) files when a source file is deleted.
Change-Id: I3131463fd7939ffc4b5bbdfa49940e03f0249a28
Tor Norbye [Thu, 25 Aug 2011 20:13:34 +0000 (13:13 -0700)]
Add support for remaining asset types in Asset Studio Wizard
This changeset ports the remaining graphic generators from the HTML5
version (notifications, tabs, action bar), and hooks up wizard support
for them.
It also adds unit tests for the generators which generates images and
compares them to known good versions. I ran these tests comparing them
to the output from the HTML5 version of Asset Studio and all but 3 of
the images varied less than 5% (and I verified the remaining manually
and they're all fine and the difference is due to the images being
aligned slightly differently.)
The icon wizard is now also hooked up to the "New" button in the
Resource Chooser for drawable resources, and this changeset also fixes
a few related issues ("New" didn't work for file-based resources, and
newly created resources weren't showing up in the selection list.)
Change-Id: I48c49f1d5de452aa5b78e491d9b07e7156397fa9
Tor Norbye [Mon, 29 Aug 2011 20:22:41 +0000 (13:22 -0700)]
A few warnings fixes
Change-Id: Ie230236444a5e1288d98feea208df5ce6508803d
Tor Norbye [Fri, 26 Aug 2011 22:31:14 +0000 (15:31 -0700)]
Fix NPE in ResourceFolder when deleting folders
This CL fixes an NPE I was hitting when deleting resource folders in
an Android project - looks like the children list is populated lazily
and dispose does not account for this
java.lang.NullPointerException
at ResourceFolder.dispose(ResourceFolder.java:131)
at ResourceRepository.removeFolder(ResourceRepository.java:146)
Change-Id: I96974c68b4ef13e6e348efd6269270d4525322ab
Siva Velusamy [Wed, 31 Aug 2011 21:44:14 +0000 (14:44 -0700)]
Maintain a cache of apps currently present in workspace.
This is needed primarily because of the huge volume of queries
from the logcat view. The cache listens to workspace updates to
keep it in sync with any workspace operations (open/close project).
Change-Id: I8179df3c14f10b114a53262ab1cf2f9b8666e329
Siva Velusamy [Thu, 25 Aug 2011 23:54:44 +0000 (16:54 -0700)]
Make search case insensitive by default.
Change-Id: Ib09281dea211cffbd5c6f8352c7002f95e99f019
Siva Velusamy [Thu, 25 Aug 2011 23:37:07 +0000 (16:37 -0700)]
Display with transient filter selected on logcat errors.
When a error message is detected on logcat, display logcat view but
with a filter for the application selected so that only the relevant
messages are displayed.
Change-Id: Ic84c59b63519302eac286ae243b228a305288b3d
Siva Velusamy [Thu, 25 Aug 2011 21:21:17 +0000 (14:21 -0700)]
Activate logcat view at appropriate times.
- When applications are launched (run/debug) on a device, start
monitoring the logcat output on that device.
- If some important message comes across, and the logcat view is not
currently displayed, then activate it.
Change-Id: Ib88973badde4cb2860379129dfe0eb03a3f955dc
Siva Velusamy [Thu, 25 Aug 2011 00:50:20 +0000 (17:50 -0700)]
Move creation of LogCatReceiver to a separate factory.
Until now there was only one instance of LogCatReceiver. This
instance would listen to the logcat output from the currently
selected device.
This patch modifies this behavior to make one LogCatReceiver
responsible for listening to only one device. If there are multiple
devices, then multiple instances of LogCatReceivers are instantiated.
The instantiation is also moved to a separate factory.
This modification allows for the scenario where the LogCatReceiver's
can be instantiated independent of the UI, and are reused by the UI
whenever needed.
Change-Id: I46008cbd5ee41880372a62e7e09634ce2d2fc122
Siva Velusamy [Mon, 29 Aug 2011 22:37:30 +0000 (15:37 -0700)]
Reduce the number of UI refreshes of the logcat table.
Currently, every time a logcat message is received, the UI is refreshed.
If multiple messages are received in close succession, multiple refreshes
are enqueued to the UI thread to be run. This results in the UI spending
all its time refreshing the table.
This patch adds a refresh to the queue only if there are no pending
refreshes. We can do so since any refresh automatically picks up the latest
state of the logcat messages received.
Change-Id: I2d9df679299710e54986c86a3610d3546924aba8
Raphael Moll [Thu, 1 Sep 2011 05:53:23 +0000 (22:53 -0700)]
SDK Manager: allow manual install of incompatible archives.
(where 'incompatible' means not intended for the host OS,
e.g. installing an archive flagged as Linux on Windows.)
By default, SDK Manager 2 doesn't show archives and
focuses on packages. However some vendors might want to
create e.g. an add-on with an OS-specific archive. Users
that do not have the OS need a way to still access and
install this. The way to do is to enable 'Show Archive
Details' in the Packages menu, manually select the
archive for any OS and install it.
SDK Bug: 19725
Change-Id: I619c9b882a4c56c0dc67b0073e6e3386f6a0e215
Raphael Moll [Wed, 31 Aug 2011 21:39:21 +0000 (14:39 -0700)]
Unit test for XML with <extra old-path> attribute.
3 independant things here:
- Added actual XML samples for XSD addon-3 and repo-5
that check we can validate and load the <extra old-paths>.
- Fixed type in Extra package, new attribute should be
named <old-paths>, not <old_paths>, for consistency.
- Split the SdkRepositoryTest in 3 (repo + addon + capture handler)
because it was started to get a bit large.
Change-Id: I0ebfe862d5131a4fa214603e071576bc9108137f
Raphael Moll [Tue, 30 Aug 2011 06:20:32 +0000 (23:20 -0700)]
Repository XSD: System Images Packages.
The underlying idea is to split system images archives
out of platforms, to reduce download size and be more
flexible in the future.
Code+unit tests are in a separate CL.
Change-Id: I9598fcab2c74e696446ebd1f6fce03832bfb711f
Raphael Moll [Tue, 30 Aug 2011 17:58:13 +0000 (10:58 -0700)]
Test ExtraPackage old_path in SDK Manager diff
One more unit-test, this time we check that when the
SDK Manager updates its package list it properly
identifies ExtraPackages that use the old_paths
attribute as an update rather than a new package.
Change-Id: I7d5a642ae3287f46a0194b9d4597206f85d2772c
Raphael Moll [Tue, 23 Aug 2011 05:32:23 +0000 (22:32 -0700)]
SDK Manager: Unit tests for ArchiveInstaller.
Change-Id: I77b369a5bd3bb81da09f6e509b67c635b7b2e2e9
Raphael Moll [Tue, 30 Aug 2011 21:26:22 +0000 (14:26 -0700)]
SDK Manager: remember window positions.
Remember window positions & sizes for the
SDK Manager 2 and the AVD Manager 1.
When restoring the windows, make sure they
fit on the visible monitor(s) area.
Also fixed a race condition where closing the
AvdManager1 window would dispose some bitmaps
but it turns out the AVD Manager can be launched
from the SDK Manager and the latter still need
these bitmaps... Hilarity ensues.
Change-Id: I2312e760029bc32561355f557a621d23ec1b6916
Raphael Moll [Tue, 30 Aug 2011 20:29:02 +0000 (13:29 -0700)]
Move ant project templates files to development.git
Change-Id: I5b066d7944d04673d47fa5b9f9cba5b2077a91ad
Raphael Moll [Thu, 25 Aug 2011 06:35:45 +0000 (23:35 -0700)]
Repository XSD: New <old_paths> in Extra packages.
This has some basic unit tests to check the presence
of the new schema, as well as path comparison done
by the ExtraPackage.
Tests for the ArchiveInstaller have been extracted
in a different CL to reduce the clutter here.
Change-Id: Iefadcbf950a56834ff09c0d1ce689411957b666e
Raphael Moll [Fri, 26 Aug 2011 21:13:16 +0000 (14:13 -0700)]
Windows: look for Java in %ProgramFiles(x86)%.
Cf bug 19551.
Change-Id: Id5ce9b0e792e7e189f9fc12e0dcfc6a63e0e2704
Raphael Moll [Fri, 26 Aug 2011 22:32:01 +0000 (15:32 -0700)]
sdkman2: don't select Win USB driver on Mac/Linux.
This is enforced by making sure we don't select packages
that do not have any archive compatible with the current
platform.
Change-Id: I5a81bbb2e868898c91f2dd77a6c1cb83b191d76a
The Android Open-Source Project [Tue, 30 Aug 2011 00:54:36 +0000 (17:54 -0700)]
merge from open-source master
Change-Id: I7b7a0174af75b7b37b9f1c5dc0adf39ab5b9d332
Raphaël Moll [Mon, 29 Aug 2011 23:52:21 +0000 (16:52 -0700)]
Merge "Findbugs cleanup in sdkmanager projects"
Michael Zoech [Mon, 29 Aug 2011 16:49:56 +0000 (18:49 +0200)]
Findbugs cleanup in sdkmanager projects
Change-Id: Ie9cd51cbec851667954b672a8dadd345aee7a71f
Tor Norbye [Mon, 29 Aug 2011 20:54:49 +0000 (13:54 -0700)]
Merge "Findbugs cleanup."
Tor Norbye [Sun, 28 Aug 2011 03:49:35 +0000 (20:49 -0700)]
Findbugs cleanup.
Change-Id: I82229e75e5a33baa690ea6b0993a4d407713e7e5
Raphael Moll [Fri, 26 Aug 2011 21:03:33 +0000 (14:03 -0700)]
Merge "SDK Manager: Fix log printf calls."
Raphael Moll [Fri, 26 Aug 2011 19:09:08 +0000 (12:09 -0700)]
SDK Manager: Fix log printf calls.
The SDK manager used to have log(String) calls which were
replaced by log(printfFormat, printfArgs..) calls in R12.
In a few places, we pass a string to the printf format that
comes from some user variable or URL or another method and
this string might contain % occurences that should not be
taken as formatters.
Change-Id: Ida29a18ba70d869a4f9d66f1d66edc010d9ec62d
The Android Open-Source Project [Fri, 26 Aug 2011 19:07:40 +0000 (12:07 -0700)]
merge from open-source master
Change-Id: Ibc17c1b227a6af2ce933040260d9b4a858eeca1d
Tor Norbye [Fri, 26 Aug 2011 19:02:34 +0000 (12:02 -0700)]
Merge "Ensure prescaled image resources are disposed of"
Tor Norbye [Fri, 26 Aug 2011 18:18:27 +0000 (11:18 -0700)]
Ensure prescaled image resources are disposed of
Change-Id: I25f49c5c30e974839cec5b26dd347737e5f04746
The Android Open-Source Project [Thu, 25 Aug 2011 01:21:32 +0000 (18:21 -0700)]
merge from open-source master
Change-Id: I1d028cceb58c0a6604961afd4c6912ab63255e7c
Tor Norbye [Thu, 25 Aug 2011 01:09:06 +0000 (18:09 -0700)]
Merge "Use GridLayout state to determine exact row and column boundaries"
The Android Open-Source Project [Thu, 25 Aug 2011 01:09:01 +0000 (18:09 -0700)]
merge from open-source master
Change-Id: I1af4b785a3d33d86f34e8abe737051d38a5a5b7a
Tor Norbye [Thu, 25 Aug 2011 01:00:10 +0000 (18:00 -0700)]
Merge "Add ia32-libs hint on Linux when aapt fails to run"
Tor Norbye [Wed, 24 Aug 2011 14:24:49 +0000 (07:24 -0700)]
Add ia32-libs hint on Linux when aapt fails to run
I had difficulties getting ADT to work when I tried running it on a 64
bit Linux system. Aapt couldn't run, even though I verified that it
was there. After searching a bit, I not only found a bunch of forums
talking about this error (and offering pretty complex solutions), it
turns out this is even discussed in the SDK Installation
Troubleshooting guide. The solution is simple: Install 32-bit
libraries using
sudo apt-get install ia32-libs
This changeset looks for this specific scenario in the aapt error
handler and emits a second error line which suggests that this
solution might be needed.
Change-Id: I453f99df61a198352f2cea4fe5cb7c517eeaf8c8
The Android Open-Source Project [Thu, 25 Aug 2011 00:56:18 +0000 (17:56 -0700)]
merge from open-source master
Change-Id: I84afb4b4d413abaee005b55fa69ef8aee49326b8
Tor Norbye [Thu, 25 Aug 2011 00:55:54 +0000 (17:55 -0700)]
Merge "Update changes.txt to reflect ADT 14 work"
Tor Norbye [Thu, 25 Aug 2011 00:54:22 +0000 (17:54 -0700)]
Merge "Turn on skip-postcompile-on-save, change asset set name"
Tor Norbye [Thu, 25 Aug 2011 00:50:59 +0000 (17:50 -0700)]
Merge "Workaround for Linux painting issue"
Tor Norbye [Wed, 24 Aug 2011 19:31:49 +0000 (12:31 -0700)]
Turn on skip-postcompile-on-save, change asset set name
This changeset contains a couple of minor but unrelated changes:
(1) Turn on the "Skip packaging and dexing until export or launch"
option. This option was added in ADT 12 by off by default. This
turns it on at least for the preview build of ADT 14.
(2) Change the name of the Asset Set (which opens the asset studio
wizard) to "Android Icon Set" to make it more obvious what it is.
(3) Tweaks some default collection sizes to avoid unnecessary growth
copies when an SDK is loaded.
Change-Id: Ib2c575c247bbfb45345d0b067e3ea944f8a72d82
Tor Norbye [Sat, 20 Aug 2011 02:00:45 +0000 (19:00 -0700)]
Update changes.txt to reflect ADT 14 work
Change-Id: I7d9925cf11b5bba3985ddd68782ded243a0da20a
The Android Open-Source Project [Wed, 24 Aug 2011 19:26:35 +0000 (12:26 -0700)]
merge from open-source master
Change-Id: I9c1cbeedb23ec54415b364fa221e06cbc91b6249
Tor Norbye [Wed, 24 Aug 2011 19:04:13 +0000 (12:04 -0700)]
Workaround for Linux painting issue
This fixes:
http://code.google.com/p/android/issues/detail?id=19447
Turns out that on Linux, painting an image with a scale transform can
be extremely expensive - it can take multiple seconds, which makes for
example interactive dragging in a RelativeLayout over a zoomed canvas
appear not to work at all (because in some cases each drag update
takes up to ten seconds).
We rely on scaling image painting when the canvas is zoomed.
To work around this, we "prescale" the images instead: Using the
source AWT image, apply a scale once (whenever the image or the zoom
level has changed), and then store the scaled image as a plain SWT
image which we can then paint on each paint refresh using a normal
(not scaling) image paint.
This change also revealed that during a palette drag, the source image
would get trashed by the palette preview code because the editor XML
model was marked as modified. This is not necessary, so during preview
painting the editor is instructed to ignore XML model updates.
Change-Id: I78f3adb77754d4f9b0daaeeb662d53f1d7ed6042
Xavier Ducrohet [Wed, 24 Aug 2011 17:38:09 +0000 (10:38 -0700)]
Merge "Remove some more obsolete code. again."
Xavier Ducrohet [Wed, 24 Aug 2011 17:38:00 +0000 (10:38 -0700)]
Merge "Rename default.prop/build.prop to project.prop/ant.prop"
Tor Norbye [Wed, 24 Aug 2011 03:05:32 +0000 (20:05 -0700)]
Use GridLayout state to determine exact row and column boundaries
This changeset updates the GridLayout support to consider the state of
a rendered GridLayout when deciding where the rows and columns
are. This information is already available in the GridLayout object,
so if one is provided use that data rather than inferring it from the
bounds of the views in each row and column.
This required changing the view rules API a bit to pass the view
objects in to the key entry points (drawing selection, drag & drop and
resize).
Change-Id: If8484f7f7181c65d0a2fdf629ffd515edd05448b
Tor Norbye [Wed, 24 Aug 2011 02:57:59 +0000 (19:57 -0700)]
Merge "Misc refactoring and test fixes"
Xavier Ducrohet [Wed, 24 Aug 2011 01:33:16 +0000 (18:33 -0700)]
Remove some more obsolete code. again.
Change-Id: If15a8521f6efc25e31cf64d984a0279fd3b153e6
Xavier Ducrohet [Tue, 23 Aug 2011 23:28:21 +0000 (16:28 -0700)]
Rename default.prop/build.prop to project.prop/ant.prop
Opening projects in Eclipse will rename the file and
"android update project" will do the same.
Change-Id: I251881897c251eb07c9704eb9c2448cab47e5b83
Xavier Ducrohet [Wed, 24 Aug 2011 01:25:59 +0000 (18:25 -0700)]
Merge "Remove more obsolete code."
Xavier Ducrohet [Tue, 23 Aug 2011 23:28:59 +0000 (16:28 -0700)]
Remove more obsolete code.
Change-Id: Ib610456aab10991818c18cd01d8680c9dc3ccd14
Siva Velusamy [Wed, 24 Aug 2011 00:09:21 +0000 (17:09 -0700)]
Merge "Make the logcat fifo size user configurable."
Siva Velusamy [Tue, 23 Aug 2011 16:47:27 +0000 (09:47 -0700)]
Make the logcat fifo size user configurable.
Add a preference where users can set the size of the message list.
Defaults to 1000.
Change-Id: Ia888c3802f07607274bfbdca0ade8fbda009ba55
The Android Open-Source Project [Tue, 23 Aug 2011 23:27:40 +0000 (16:27 -0700)]
merge from open-source master
Change-Id: Idbf89698ad119d04b8a69f33e97c3d50bb8d56c6
Xavier Ducrohet [Tue, 23 Aug 2011 23:23:17 +0000 (16:23 -0700)]
Merge "Prevent running debug and release targets at the same time."
Xavier Ducrohet [Tue, 23 Aug 2011 23:22:54 +0000 (16:22 -0700)]
Merge "Remove unused export project feature."
Xavier Ducrohet [Tue, 23 Aug 2011 22:19:33 +0000 (15:19 -0700)]
Prevent running debug and release targets at the same time.
This is not possible since they rely on the same properties which
cannot be updated after they are set.
Change-Id: I2fbc0f53b656f5906c2b026d8fd41d78a4461803
Tor Norbye [Tue, 23 Aug 2011 00:32:40 +0000 (17:32 -0700)]
Misc refactoring and test fixes
This changeset turns on automatic formatting of the affected regions
in extract include, change layout, wrap in and style refactorings.
It also fixes a couple of minor bugs - one handling empty tags in the
change widget type refactoring, and one handling selection offsets.
It also turns on automatic formatting of GUI editor changes (there was
a previous changeset which prepared for this but forgot to actually
switch the default option.)
This changeset also makes various test infrastructure fixes: code
completion tests recently stopped working for a number of files
(something about the initialization order of editor types when running
as tests). I also tweaked the goldenfile format of the diffs to avoid
trailing diffs on lines with just a ">" or "<" since gerrit makes thee
light up in red.
Change-Id: I78b858f0b21e5b2f25a9566ad495bad09c66a18f
Xavier Ducrohet [Tue, 23 Aug 2011 18:29:13 +0000 (11:29 -0700)]
Remove unused export project feature.
Change-Id: Ia40c3ff899c2641ab18c3aaad6edbc0856a0534e
The Android Open-Source Project [Tue, 23 Aug 2011 18:20:49 +0000 (11:20 -0700)]
merge from open-source master
Change-Id: Ide29dfe8d457e176fe758d3998d73703bf08122b
Siva Velusamy [Tue, 23 Aug 2011 18:09:14 +0000 (11:09 -0700)]
Merge "Use SWT Label's instead of Link's for proper wrap behavior."
Siva Velusamy [Tue, 23 Aug 2011 17:21:11 +0000 (10:21 -0700)]
Use SWT Label's instead of Link's for proper wrap behavior.
On Mac, Link widgets to not enforce SWT.WRAP style. As a result,
text is just clipped instead of being wrapped. Split the privacy
policy text into two separate components - one with the text, and
one with the link, and use Label's for the longer text content.
Change-Id: Ic667b9ec62c0ce26c43611b97e0bbdc89dbc68d6
The Android Open-Source Project [Tue, 23 Aug 2011 03:41:39 +0000 (20:41 -0700)]
merge from open-source master
Change-Id: I70b01f87703bcc71cba687fa9b8bbdf75c09a67c
Xavier Ducrohet [Tue, 23 Aug 2011 03:40:25 +0000 (20:40 -0700)]
Merge "Modify android create/update project to deal with new build.xml"
Xavier Ducrohet [Tue, 23 Aug 2011 03:10:38 +0000 (20:10 -0700)]
Modify android create/update project to deal with new build.xml
New mechanism to embed a build version into build.xml to figure out
whether the build.xml file is obsolete or not.
Use the version-tag: custom case to prevent erase user modifications.
Fixed some issues with the name of the project (put in build.xml) for
test projects which don't have any activity.
Change-Id: Ib0333d15ca9558fffe24a718e704fcf4176c9014
The Android Open-Source Project [Tue, 23 Aug 2011 00:17:59 +0000 (17:17 -0700)]
merge from open-source master
Change-Id: I7a0eadee25f111092120e3798ba7463d70742e5e
Siva Velusamy [Tue, 23 Aug 2011 00:06:34 +0000 (17:06 -0700)]
Merge "Open SDK stats dialog from an existing shell."
The Android Open-Source Project [Mon, 22 Aug 2011 22:33:18 +0000 (15:33 -0700)]
merge from open-source master
Change-Id: I92c4b2b74cc08b1681e9986e89b28943bbd72e1a
Xavier Ducrohet [Mon, 22 Aug 2011 22:19:57 +0000 (15:19 -0700)]
Merge "Renable test coverage from Ant."
Xavier Ducrohet [Mon, 22 Aug 2011 21:44:50 +0000 (14:44 -0700)]
Renable test coverage from Ant.
Added a warning regarding the requirement of a rooted device.
Also made it so that the test can be run without having to build
and install the packages with just "ant emma test"
Change-Id: Id643b5f56585954b91c9c85c3eb33c4ef31c196a
Siva Velusamy [Mon, 22 Aug 2011 21:10:57 +0000 (14:10 -0700)]
Open SDK stats dialog from an existing shell.
This patch addresses Issue #15267. The primary issue is that the SDK
stats permission dialog was opened from a separate Job, and this
dialog shows up when the user opens the preference page for the
first time. Since both of them happen to be modal dialogs, the
behavior is inconsistent, and many times results in a blocked UI.
The patch fixes this issue by opening up the stats dialog as a child
of the preference page dialog within ADT, and as a child of a new
shell within DDMS.
Change-Id: I8c9ed9e9bbfac855435690f287b4f60975f336fb
The Android Open-Source Project [Mon, 22 Aug 2011 18:14:16 +0000 (11:14 -0700)]
merge from open-source master
Change-Id: I3c5dcd5ddc56165a211b8c2f6960d13a583e5e0f
Xavier Ducrohet [Mon, 22 Aug 2011 18:05:25 +0000 (11:05 -0700)]
Merge "Move the project conversion of bin location from callback to build."
Bill Napier [Mon, 22 Aug 2011 18:02:15 +0000 (11:02 -0700)]
Merge "Change how to find adb."
Bill Napier [Mon, 22 Aug 2011 18:02:05 +0000 (11:02 -0700)]
Merge "Fix CastClassException by using the right class."
The Android Open-Source Project [Mon, 22 Aug 2011 18:01:05 +0000 (11:01 -0700)]
merge from open-source master
Change-Id: I0910a47ff7fcce5d5983092b10389f0eefc8bf59
Raphael Moll [Mon, 22 Aug 2011 17:54:12 +0000 (10:54 -0700)]
Merge "Change way we report Eclipse version in stat ping."
Bill Napier [Mon, 22 Aug 2011 17:21:52 +0000 (10:21 -0700)]
Change how to find adb.
This method is aligned with how hierarchyviewer2 finds adb.
Change-Id: I56a5a12e3e6ff592748a3afee18299d16066a537
Bill Napier [Mon, 22 Aug 2011 17:21:27 +0000 (10:21 -0700)]
Fix CastClassException by using the right class.
Change-Id: I691ded197cfb47acfa1da12f48f6d7e50254bbc9
The Android Open-Source Project [Mon, 22 Aug 2011 00:27:15 +0000 (17:27 -0700)]
merge from open-source master
Change-Id: I9aae81e2cc340af52f056712645650085c785a45