OSDN Git Service
Raphael Moll [Sat, 28 Aug 2010 04:42:56 +0000 (21:42 -0700)]
Merge "ADT: Make GLE2 the default."
Omari Stephens [Sat, 7 Aug 2010 02:46:00 +0000 (19:46 -0700)]
Write tests for the new ITestRunListener API method
Change-Id: Ieea11742ae23cc30296fcc1cfe477d9814fa4a4e
Omari Stephens [Sat, 7 Aug 2010 02:43:52 +0000 (19:43 -0700)]
Fix the ddmlib makefiles to compile tests properly
Change-Id: Id5012098dccbd264890251fdff57b91ca3ae1b85
Omari Stephens [Fri, 6 Aug 2010 03:10:18 +0000 (20:10 -0700)]
Store and report metrics emitted during each test case
Change-Id: Ia7e7f6bef73e7ecd30b03973fd966d28ac90464b
Konstantin Lopyrev [Sat, 28 Aug 2010 02:05:05 +0000 (19:05 -0700)]
Merge "Adding a smaller timeout to capturing nodes. This is so that it doesn't get stuck."
Konstantin Lopyrev [Sat, 28 Aug 2010 02:02:42 +0000 (19:02 -0700)]
Adding a smaller timeout to capturing nodes. This is so that it doesn't get stuck.
Change-Id: Ie2fd89d74a2a044334b45ba050f2c3150f63a8e7
Xavier Ducrohet [Sat, 28 Aug 2010 01:40:32 +0000 (18:40 -0700)]
Recompute feature dependencies.
Change-Id: I22afafe283cd2e114f4d3b84687adcd18c17d784
Xavier Ducrohet [Sat, 28 Aug 2010 01:32:57 +0000 (18:32 -0700)]
Misc fix in HierarchyViewer plugin.
- Add plug-in to the update sites
- Remove ddm(ui)lib from the plugin as it accesses the ddms plug-in
Change-Id: I524180688443e0a72443a04fc3f00300e8ddc165
Konstantin Lopyrev [Sat, 28 Aug 2010 01:16:28 +0000 (18:16 -0700)]
Fix broken plug-in
Change-Id: I8a6c8bd4b3d5ce0d7bcda5154c0187c256ab3db9
Konstantin Lopyrev [Sat, 28 Aug 2010 00:55:52 +0000 (17:55 -0700)]
Renaming and adding //$NON-NLS-?$
Change-Id: I9f5fa1625af4b35499cfc87996d0b3a39841ba31
Xavier Ducrohet [Sat, 28 Aug 2010 00:00:56 +0000 (17:00 -0700)]
Merge "NPE in FolderDecorater"
Konstantin Lopyrev [Fri, 27 Aug 2010 16:08:34 +0000 (09:08 -0700)]
Refactoring and integrating into Eclipse
Change-Id: I1fd3c3828fb2474f2f7394ee2831fcd7eb675878
Konstantin Lopyrev [Thu, 26 Aug 2010 00:46:57 +0000 (17:46 -0700)]
Making the profiling box slightly transparent
Change-Id: I886a8b1c61db11d521657ec776152b07e7f9fabb
Konstantin Lopyrev [Fri, 27 Aug 2010 23:20:11 +0000 (16:20 -0700)]
Merge "Bug fixes and reducing timeout."
Konstantin Lopyrev [Fri, 27 Aug 2010 23:20:04 +0000 (16:20 -0700)]
Merge "Renaming"
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:59 +0000 (16:19 -0700)]
Merge "Commentary, getting rid of bad about image, and some clean-up."
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:50 +0000 (16:19 -0700)]
Merge "Making the profiling stuff appear in a cool place."
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:43 +0000 (16:19 -0700)]
Merge "Creating the application"
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:35 +0000 (16:19 -0700)]
Merge "Tweaking and moving."
Andy McFadden [Fri, 27 Aug 2010 22:48:04 +0000 (15:48 -0700)]
Merge "Add "suspended" state to thread display."
Konstantin Lopyrev [Wed, 25 Aug 2010 20:24:17 +0000 (13:24 -0700)]
Bug fixes and reducing timeout.
Change-Id: Ibfa23734679d0337aa7f6e250a621026b13a70f0
Konstantin Lopyrev [Wed, 25 Aug 2010 19:28:47 +0000 (12:28 -0700)]
Renaming
Change-Id: I10c8b1cf1be3b66fe0b7527ffb72501d8d61ebb3
Konstantin Lopyrev [Wed, 25 Aug 2010 19:17:49 +0000 (12:17 -0700)]
Commentary, getting rid of bad about image, and some clean-up.
Change-Id: I9dad056de8e7e208f156bbedbced47dd49b61fcb
Konstantin Lopyrev [Wed, 25 Aug 2010 06:06:45 +0000 (23:06 -0700)]
Making the profiling stuff appear in a cool place.
Change-Id: Id28e1a2a01ec88210a7024e2ad115131c9e4d34e
Konstantin Lopyrev [Thu, 19 Aug 2010 05:08:09 +0000 (22:08 -0700)]
Creating the application
Change-Id: I8f2fce7328cc1d93caed1cf003f04e41204f864c
Konstantin Lopyrev [Wed, 18 Aug 2010 01:00:33 +0000 (18:00 -0700)]
Tweaking and moving.
Change-Id: I9906268a91c53c7b9e938b9c969cedeae2a4303a
Omari Stephens [Thu, 26 Aug 2010 21:32:29 +0000 (14:32 -0700)]
Merge "Fix permissions: source files shouldn't be executable"
Raphael Moll [Thu, 26 Aug 2010 05:06:04 +0000 (22:06 -0700)]
ADT: Make GLE2 the default.
Export USE_GLE1 to something != 0 to force GLE1.
Change-Id: I525bc276f3ad096d6ae64508f4c9808f52684b02
Omari Stephens [Fri, 6 Aug 2010 01:37:52 +0000 (18:37 -0700)]
Fix permissions: source files shouldn't be executable
Change-Id: I4030ca07fb40e171978d8eb366b6d403e3c9ea2c
Xavier Ducrohet [Wed, 25 Aug 2010 22:48:04 +0000 (15:48 -0700)]
Merge "Create MonkeyRunner docs target to generate SDK docs."
Xavier Ducrohet [Wed, 25 Aug 2010 22:46:44 +0000 (15:46 -0700)]
Merge "DOC: Updated doc for MonkeyRunner API"
Bill Napier [Wed, 25 Aug 2010 17:30:38 +0000 (10:30 -0700)]
Merge "sdk-docs output format for use in generating the SDK documentation for MonkeyRunner."
Andy McFadden [Wed, 25 Aug 2010 17:05:33 +0000 (10:05 -0700)]
Add "suspended" state to thread display.
Change-Id: Id13f96d1e490228a2fc9a7452a34cd4ac7e5aa46
Brett Chabot [Tue, 24 Aug 2010 04:37:48 +0000 (21:37 -0700)]
Merge "Allow adt-tests to access package-private elements."
The Android Open Source Project [Mon, 23 Aug 2010 22:25:09 +0000 (15:25 -0700)]
merge from tools_r7
Change-Id: Ib8fa2647481d2d61d9bea2d5cd30fb0207e1dcf3
Xavier Ducrohet [Mon, 23 Aug 2010 22:14:24 +0000 (15:14 -0700)]
Merge "SDK Launcher: add win32 app manifest" into tools_r7
Raphael Moll [Sun, 22 Aug 2010 00:59:12 +0000 (17:59 -0700)]
SDK Launcher: add win32 app manifest
Merged from master to tools_r7
Change-Id: Ic9b8d265868b0e062fce067312c9e9fa89bba3c7
Xavier Ducrohet [Mon, 23 Aug 2010 22:13:28 +0000 (15:13 -0700)]
Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"" into tools_r7
The Android Open Source Project [Mon, 23 Aug 2010 22:13:20 +0000 (15:13 -0700)]
merge from tools_r7
Change-Id: I36f9cb801e3dfe6338f503c49e3380d565214be3
Raphael Moll [Sun, 22 Aug 2010 01:03:49 +0000 (18:03 -0700)]
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Merged from master to tools_r7
Change-Id: Ib8e702344dd2d593d7f7e6d56b0c3534480ff376
Xavier Ducrohet [Mon, 23 Aug 2010 21:42:33 +0000 (14:42 -0700)]
Improve capability of the post-compile target.
Make the dex target use a different property to read
the input folder for classes to dexify.
By default the new property has the same value but can
be overriden if a post-compile target modify (obfuscate)
code into a different location.
Merged from master into tools_r7
Change-Id: I1fe2fd2a2678d8c4354702250cea1481f74dd7cf
Xavier Ducrohet [Mon, 23 Aug 2010 22:06:40 +0000 (15:06 -0700)]
Merge "Improve capability of the post-compile target."
Xavier Ducrohet [Mon, 23 Aug 2010 21:42:33 +0000 (14:42 -0700)]
Improve capability of the post-compile target.
Make the dex target use a different property to read
the input folder for classes to dexify.
By default the new property has the same value but can
be overriden if a post-compile target modify (obfuscate)
code into a different location.
Change-Id: I9caeca9f342c7ead1dcee9b4d80cde4ad741a843
Raphael Moll [Mon, 23 Aug 2010 21:01:32 +0000 (14:01 -0700)]
Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe""
Raphael Moll [Mon, 23 Aug 2010 21:01:24 +0000 (14:01 -0700)]
Merge "SDK Launcher: add win32 app manifest"
Raphael Moll [Sun, 22 Aug 2010 01:03:49 +0000 (18:03 -0700)]
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Change-Id: Id62b59e75e92fe14376353211dd59d89f4ee63c6
Raphael Moll [Mon, 23 Aug 2010 20:11:14 +0000 (13:11 -0700)]
Merge "Fix error strings: it's "dx.jar", not "dex.jar""
The Android Open Source Project [Mon, 23 Aug 2010 20:05:56 +0000 (13:05 -0700)]
merge from tools_r7
Change-Id: I1c48422d1732d53527d7afae6c30c285bee54146
Raphael Moll [Sat, 21 Aug 2010 04:54:59 +0000 (21:54 -0700)]
Android.bat support for Java 64-bit.
android.bat: properly encode file using CRLF (not Unix mode).
find_java.bat: properly check for Java in the 64-bit ProgramFiles path.
Change-Id: If4a106f144b5b890a62fc5543b35df85ab5ab06c
Raphael Moll [Mon, 23 Aug 2010 19:42:23 +0000 (12:42 -0700)]
Merge "Android.bat support for Java 64-bit."
snpe [Wed, 18 Aug 2010 19:24:41 +0000 (21:24 +0200)]
NPE in FolderDecorater
Change-Id: Ica70dedb0b86ab877337d001aac6a205b15a60c0
Raphael Moll [Sun, 22 Aug 2010 00:59:12 +0000 (17:59 -0700)]
SDK Launcher: add win32 app manifest
Change-Id: Iac3ad3d28d62c67b15b75346a56c2194f1837096
Brett Chabot [Sat, 21 Aug 2010 02:22:49 +0000 (19:22 -0700)]
Allow adt-tests to access package-private elements.
Previously when running tests in the continuous tests system, adt-tests could
not access any package-private elements in adt. This was because adt-tests was
a separate plugin and thus had a separate class loader.
With this commit, adt-tests is now a fragment, and its code runs inside the
adt plugin.
Bug
2179353
Change-Id: Iec8c08bed2fa116b38490a774cd3bd6f4c7358a5
Raphael Moll [Sat, 21 Aug 2010 19:43:31 +0000 (12:43 -0700)]
Fix error strings: it's "dx.jar", not "dex.jar"
The error message has the wrong file name and that
confused me when I manually created my platform-tools.
Change-Id: I2d1b5258db99c5359c0ebe71d42b2d93558941ac
Raphael Moll [Sat, 21 Aug 2010 19:17:03 +0000 (12:17 -0700)]
Disable tests using EasyMock to fix build.
We'll try to fix it in another CL later.
Change-Id: I3a0c5131e6e9398a657081a639fbfd6aa670ba97
Raphael Moll [Sat, 21 Aug 2010 04:54:59 +0000 (21:54 -0700)]
Android.bat support for Java 64-bit.
android.bat: properly encode file using CRLF (not Unix mode).
find_java.bat: properly check for Java in the 64-bit ProgramFiles path.
Change-Id: I78adb4783955cfad867d29f66d7ee58a017d41c4
Raphael Moll [Sat, 21 Aug 2010 18:05:37 +0000 (11:05 -0700)]
Merge changes Ie49a141a,I71c6f4b6
* changes:
UnitTest for UpdaterLogic.findPlatformToolsDependency.
SDK Manager support for Platform-Tools
Raphael Moll [Sat, 21 Aug 2010 18:01:30 +0000 (11:01 -0700)]
Merge "ADT GLE unit tests."
Brett Chabot [Sat, 21 Aug 2010 00:01:21 +0000 (17:01 -0700)]
Merge "Force disconnect of all devices when adb connection is lost."
The Android Open Source Project [Fri, 20 Aug 2010 17:51:08 +0000 (10:51 -0700)]
merge from tools_r7
Change-Id: I0a73800c5f6454a012d6556668aa98ddfb53db3a
Xavier Ducrohet [Wed, 18 Aug 2010 18:54:31 +0000 (11:54 -0700)]
Merge sdklib manifest fix for r7. DO NOT MERGE.
Original commit msg:
Fix missing dependency in the sdklib manifest + improved error reporting.
Change-Id: I778a839cc280db8bcc7a4a0b11378119de9aed57
Bill Napier [Fri, 20 Aug 2010 05:47:36 +0000 (22:47 -0700)]
Create MonkeyRunner docs target to generate SDK docs.
Change-Id: Id84e1aec8965ac0efc58c25234855960e826fb3b
Bill Napier [Fri, 20 Aug 2010 05:46:43 +0000 (22:46 -0700)]
sdk-docs output format for use in generating the SDK documentation for MonkeyRunner.
Change-Id: Iaf8cb5273d025983e62cca6ab092dca9e97c331a
Raphael Moll [Fri, 20 Aug 2010 03:56:26 +0000 (20:56 -0700)]
UnitTest for UpdaterLogic.findPlatformToolsDependency.
Change-Id: Ie49a141ad0d25021164166aeb4405877045719bf
Raphael Moll [Thu, 19 Aug 2010 23:55:17 +0000 (16:55 -0700)]
SDK Manager support for Platform-Tools
Changes:
- Fixed dependency (PlatformToolPackage was made to depend
on itself... oops it should have been ToolPackage!)
- Load platform-tool from XML.
- Specify sorting order of platform-tool in list.
- Compute a platform-tool has a dependency for tool package.
- Added a totally impressive icon for the new platform-tool package.
- Update the schema comments to explicitely indicate what is new.
Change-Id: I71c6f4b61028990d051a479b919a7f55a79f87cf
Ben Dodson [Thu, 19 Aug 2010 22:23:46 +0000 (15:23 -0700)]
Merge "Transition from clearsilver to jsilver"
Ben Dodson [Thu, 19 Aug 2010 22:15:50 +0000 (15:15 -0700)]
Transition from clearsilver to jsilver
Change-Id: Iea2fb85b246685b1c2e27866bb1c1df80fa55abe
Konstantin Lopyrev [Thu, 19 Aug 2010 22:06:39 +0000 (15:06 -0700)]
Merge "Adding property and profile viewers + misc"
Konstantin Lopyrev [Thu, 19 Aug 2010 22:06:10 +0000 (15:06 -0700)]
Merge "Increasing the changes of a device connecting properly and making sure things are disposed of properly."
Konstantin Lopyrev [Thu, 19 Aug 2010 22:05:31 +0000 (15:05 -0700)]
Merge "Adding the new tree view."
Konstantin Lopyrev [Thu, 19 Aug 2010 22:04:34 +0000 (15:04 -0700)]
Merge "Adding pixel perfect view, loupe and tree."
Raphael Moll [Thu, 19 Aug 2010 21:53:36 +0000 (14:53 -0700)]
Merge "ADT-Tests: Unit test for GRE NodeFactory."
Xavier Ducrohet [Thu, 19 Aug 2010 21:30:49 +0000 (14:30 -0700)]
Merge "Fix missing dependency in the sdklib manifest + improved error reporting."
Raphael Moll [Thu, 19 Aug 2010 21:03:57 +0000 (14:03 -0700)]
Merge "ADT-Tests: add external/easymock to the classpath."
Raphael Moll [Thu, 19 Aug 2010 21:02:25 +0000 (14:02 -0700)]
ADT GLE unit tests.
There isn't as much as would want to here.
I need to refactor the RulesEngine to make it more testable,
the major block is that it uses the static AdtPlugin to find
the groovy files path and that doesn't exist in the UT.
Change-Id: I96c0821252d5b777665ed68153fde63d140d0ee5
Xavier Ducrohet [Wed, 18 Aug 2010 18:54:31 +0000 (11:54 -0700)]
Fix missing dependency in the sdklib manifest + improved error reporting.
Change-Id: I197d17ee3dcf7119fe9da4b7f29bb9bce193ff12
Konstantin Lopyrev [Wed, 11 Aug 2010 19:45:59 +0000 (12:45 -0700)]
Adding property and profile viewers + misc
Change-Id: I04b7e6045047d303b3434dc64662ffeb36c48c24
Konstantin Lopyrev [Tue, 10 Aug 2010 00:42:51 +0000 (17:42 -0700)]
Increasing the changes of a device connecting properly and making sure things are disposed of properly.
Change-Id: Ib1190c65c8ac9795fc0b97beacd7fd102cb95abf
Konstantin Lopyrev [Fri, 6 Aug 2010 01:00:36 +0000 (18:00 -0700)]
Adding the new tree view.
Change-Id: I490f475fadaec5625352a49524ec8cb3a6e9b7d4
Konstantin Lopyrev [Fri, 30 Jul 2010 00:30:16 +0000 (17:30 -0700)]
Adding pixel perfect view, loupe and tree.
Change-Id: I9be3e9037dec5eeb240608ba8c6329fd77689bbe
Xavier Ducrohet [Wed, 18 Aug 2010 00:58:05 +0000 (17:58 -0700)]
Merge "Making sure the old hierarchy viewer works with categorized properties."
Bill Napier [Tue, 17 Aug 2010 16:49:56 +0000 (09:49 -0700)]
Merge "Add paragraph support into MonkeyRunner documentation."
Joe Malin [Fri, 6 Aug 2010 01:04:42 +0000 (18:04 -0700)]
DOC: Updated doc for MonkeyRunner API
Change-Id: Id2682f2922a5ca509211a0c18c9c1366f0b020dc
Raphael Moll [Mon, 16 Aug 2010 20:47:21 +0000 (13:47 -0700)]
ADT-Tests: Unit test for GRE NodeFactory.
Change-Id: I33039b0be05f0eca51f1fd5c6f616d01f46a59b7
Raphael Moll [Mon, 16 Aug 2010 20:41:57 +0000 (13:41 -0700)]
ADT-Tests: add external/easymock to the classpath.
Change-Id: I892f686b98efad14ac5de932030238116bf0d3d4
Brett Chabot [Sat, 31 Jul 2010 01:18:32 +0000 (18:18 -0700)]
Force disconnect of all devices when adb connection is lost.
Bug
2873317
Change-Id: Idc56be6dbd8912ee463295ddfe6f3b0bbf0b5125
Konstantin Lopyrev [Wed, 11 Aug 2010 19:52:19 +0000 (12:52 -0700)]
Making sure the old hierarchy viewer works with categorized properties.
Change-Id: Ie0406055c73881a1cc238689b05567bca09fc8b1
Raphael Moll [Tue, 10 Aug 2010 17:20:46 +0000 (10:20 -0700)]
Ant: ensure SDK path ends with dir separator.
SDK Bug:
2906094
Change-Id: Ic4053c97c8dd5a32a2276e22644b5e09c91d52f0
Raphael Moll [Tue, 10 Aug 2010 02:51:44 +0000 (19:51 -0700)]
ADT: Fix visibility of method so that Eclipse tests can access it.
Also added an annotation to indicate why it has been made
public.
SDK Bug:
2906164
Change-Id: I9490467a72989392f838a8c8e7137e929721358e
Bill Napier [Sun, 8 Aug 2010 05:40:09 +0000 (22:40 -0700)]
Add paragraph support into MonkeyRunner documentation.
Any strings that contain a newline are now broken up when put into the HDF.
This allows the formatters to do special per-paragraph formatting (very useful
for the HTML output).
Change-Id: If2e1dd1a6c752afe900745347ff6c9a9e4bb406d
Raphael Moll [Fri, 30 Jul 2010 22:37:25 +0000 (15:37 -0700)]
SdkManager: support for upgrade to Schema #3.
This changes the way the sdk manager looks for schema upgrades:
- when trying to load an XML, parse the root element and scan
for our XLMNS. If it parses, get the version number at the end
and use this directly to try to load using the right schema.
- In turn this allows us to distinguish between an incorrectly
formatted XML (but using the right schema) versus something
that is not our XML schema or not an XML at all, and then we
can produce better errors for the user.
- We also then directly know when the schema version is above
the known value of the tool and can then create the upgrade
tools node accordingly.
Change-Id: I58c7d89d7b57dd4d5488f726e5f8b21cc4308451
Xavier Ducrohet [Tue, 27 Jul 2010 22:08:15 +0000 (15:08 -0700)]
Update sdklib to use the new sdk organization (build tools moved)
Also do some minor clean-up from the recent change to ProjectProperties.
FileWrapper extends java.io.File so there's no need to create a File
and then create a FileWrapper around it. Directly create a FileWrapper.
Change-Id: I3f072bf7f848d63b90fa03bec2683f6a009deb88
Raphael Moll [Fri, 30 Jul 2010 04:09:40 +0000 (21:09 -0700)]
Merge "SdkManager: new schema with <platform-tool> package."
Raphael Moll [Fri, 30 Jul 2010 04:08:40 +0000 (21:08 -0700)]
Merge "SdkManager: don't use deprecated methods."
Xavier Ducrohet [Fri, 30 Jul 2010 03:52:15 +0000 (20:52 -0700)]
Merge "Clean up the previous fix to ApkBuilder with regard to the keystore."
Raphael Moll [Thu, 29 Jul 2010 20:15:04 +0000 (13:15 -0700)]
SdkManager: new schema with <platform-tool> package.
This adds the new schema (v3), the internal definitions and
constants. However the schema v3 is not enabled as default and
the whole thing is not used by the downloader/installer yet.
Note: some files in this folder are using Windows \r\n end-of-lines.
I will convert them to Unix \n EOLs in *another* CL, not this one.
Change-Id: I327f12571ad3959e85a7b972cad98663c09cce33
Raphael Moll [Thu, 29 Jul 2010 17:58:20 +0000 (10:58 -0700)]
SdkManager: don't use deprecated methods.
If we're going to deprecate the parsePropertyFile(File), we might
as well stop using it ourselves.
Also removes the obsolete parsePropertyFile(File) method.
Change-Id: I811590ca583f2a89d5b7d606d70a4bc14eb6230b
Xavier Ducrohet [Fri, 30 Jul 2010 00:46:40 +0000 (17:46 -0700)]
Merge "Don't rely on map to store layout device configs."
Xavier Ducrohet [Thu, 29 Jul 2010 22:52:35 +0000 (15:52 -0700)]
Clean up the previous fix to ApkBuilder with regard to the keystore.
Change-Id: I620269355e176d9167ceb733191ee5ea8908d06a
Xavier Ducrohet [Thu, 29 Jul 2010 00:01:55 +0000 (17:01 -0700)]
Don't rely on map to store layout device configs.
Relying on maps means that we don't control the order of the configs
in the UI. Mac/Windows show a different order already, and it's just
luck that the Mac one matches the content of the XML.
Now we keep the order from the XML and display it as-is in the UI.
Change-Id: I900f330a4ea9059fe27df2bca6c3a7a770737ae4