aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update ddms (all) and 'android' (linux/mac) to user explicit classpathXavier Ducrohet2010-07-267-11/+17
| | | | | | | | | | They were still using the old method of providing a jar folder through java.ext.dirs in which to look for jar files. The jar dependency is now explicit in the manifest, which allows us to target ddmlib explicitely and not ddmlib-prebuilt. Change-Id: Ic3c5708ab327a3e1fb7a7cd86fffda96e0d988dd
* merge from tools_r7The Android Open Source Project2010-07-260-0/+0
|\ | | | | | | Change-Id: I27e0f8e3ab5a6a9d207ee969b30b7ffbb8e1b834
| * Fix issue with qualifier combo box not filled up in device mode DO NOT MERGEXavier Ducrohet2010-07-261-4/+3
| | | | | | | | | | | | | | | | | | device mode is when the qualifier values must match what a device would report. For instance nodpi should not be selectable. Cherry-picked from master to tools_r7 Change-Id: I22cbd5b3522ae17d4d7f61e95ca20deeea825a79
* | Fix issue with qualifier combo box not filled up in device modeXavier Ducrohet2010-07-261-4/+3
| | | | | | | | | | | | | | device mode is when the qualifier values must match what a device would report. For instance nodpi should not be selectable. Change-Id: I902697d72ffad196fcaf41b1e6387cdfcbbc18da
* | Update the ddmlib api for push/pull/installXavier Ducrohet2010-07-2633-545/+848
| | | | | | | | | | | | | | | | | | | | | | | | | | The API now throws SyncException instead of returning SyncResult. The IDevice API to install/uninstall now returns a single InstallException that encapsulate all the other ddmlib exception. Also, the recently added exceptions now don't extend IOException anymore. Change-Id: Ib334c4157a6add1882233dfaaa032aea1910eede
* | Merge "Fix EclipseTestCollector for Eclipse 3.6's JUnit lib."Raphael Moll2010-07-241-14/+30
|\ \
| * | Fix EclipseTestCollector for Eclipse 3.6's JUnit lib.Raphael Moll2010-07-231-14/+30
| | | | | | | | | | | | | | | | | | Some method signatures have changed. Change-Id: Iff11d8bc3ba670a59491f0b5ba50de8bad79c1bf
* | | Merge "Fix QualifierListTest and ConfigMatchTest unittests."Raphael Moll2010-07-242-11/+32
|\ \ \ | |/ /
| * | Fix QualifierListTest and ConfigMatchTest unittests.Raphael Moll2010-07-232-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testQualifierList() checks the number of qualifiers against FolderConfiguration.INDEX_COUNT except there's a mismatch since there was no index 13. ConfigMatchTest was missing the new dock/night and nav state. Change-Id: I5df0b1375a209cca5a39d93946b62b88f2688fb2
* | | ADT GLE2: fix, don't use constant from SWT 3.5.00Raphael Moll2010-07-231-6/+14
| | | | | | | | | | | | | | | | | | | | | The build server still builds using 3.4 and we still support 3.4 at runtime. Change-Id: I8f6ac24e77eef1daac68ee7f595fb66654762d6b
* | | Fix SDK build for eclipse tests.Raphael Moll2010-07-232-9/+10
| | | | | | | | | | | | | | | | | | Broken by Change: If04c5f8b10eeaca494a155ed6c4a25bf0d9d892c Change-Id: I8f60da7d537af68df47119b636eaf03c49b51146
* | | Merge "ADT GLE2: Deal with missing custom view classes."Raphael Moll2010-07-235-133/+573
|\ \ \ | |/ /
| * | ADT GLE2: Deal with missing custom view classes.Raphael Moll2010-07-235-133/+573
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Detect missing view classes and replace them by a MockView. (This alone makes the rendering useful instead of not updating it on error.) - Display the name of the missing view classes. - Make them hot links and display the New Class Wizard to create them. Change-Id: I20b69db5428751c4a6c1367103462b3867fa9c7d
* | | Merge "parse instrumentation result bundles"Jean-Baptiste Queru2010-07-234-23/+84
|\ \ \ | |/ / |/| |
| * | parse instrumentation result bundlesGuang Zhu2010-07-164-23/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During tests, there are per-instrumentation based results emmitted as key-value pairs. Examples include performance tests and normal tests in code coverage mode. Currently most of these are discarded by InstrumentationResultParser, this change adds parsing function, stores the key-value pairs in a map, and finally send it to ITestRunListeners at the end of test run. Change-Id: If04c5f8b10eeaca494a155ed6c4a25bf0d9d892c
* | | Merge "ADT GLE2: Properly handle custom classes."Raphael Moll2010-07-234-78/+133
|\ \ \
| * | | ADT GLE2: Properly handle custom classes.Raphael Moll2010-07-234-78/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to drag'n'drop or paste a custom class in a project that doesn't have the class. The paste operation will succeed and the layout rendering will provide a clear error indicating the class is missing. Change-Id: I80bbc70cfdba68277120dff3e770ce31651e7ebc
* | | | Merge changes I792947e3,Ifc7b150eRaphael Moll2010-07-2310-34/+297
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * changes: ADT GLE2: paste element in empty layout. ADT GLE2: implementation paste operation.
| * | | ADT GLE2: paste element in empty layout.Raphael Moll2010-07-222-8/+117
| | | | | | | | | | | | | | | | Change-Id: I792947e39d4b0ef7828f2df394bac81c0da37970
| * | | ADT GLE2: implementation paste operation.Raphael Moll2010-07-229-28/+182
| | | | | | | | | | | | | | | | Change-Id: Ifc7b150eefd810a7c615fd9d3f26904e59c6c4aa
* | | | Merge "Move tools to r8 in the dev branch."Xavier Ducrohet2010-07-221-1/+1
|\ \ \ \
| * | | | Move tools to r8 in the dev branch.Xavier Ducrohet2010-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I703a4a52c0f2e76c5b19103f3b43ef203472006c
* | | | | merge from tools_r7The Android Open Source Project2010-07-221-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | Change-Id: Id00197ab55d948f7ef679a17c1d00a3c4e05dfc8
| * | | Fix a potential npe preventing the library project selection from working.Xavier Ducrohet2010-07-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the workspace has broken projects, Sdk.getProjectState() can return null for them, causing an NPE in the IProjectChooserFilter. I had fixed NonLibraryProjectOnlyFilter but apparently, not LibraryProjectOnlyFilter. Change-Id: I9a85ce61885888e0107acf2f9cb5e3491ed8f1fb
* | | | ADT GLE2: Properly handle empty documents, including drag'n'drop.Raphael Moll2010-07-216-201/+360
| | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to drop into empty documents. Change-Id: I512d8ff5e8747e4d3f5e27900308157e75cacd57
* | | | ADT GLE2: Let groovy rules access a public API of the RulesEngine.Raphael Moll2010-07-216-14/+136
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by injecting a property in the groovy rule instance with a new interface, the IClientRulesEngine. The client callback currently has 2 useful methods: debugPrintf (which has been moved out of INode) and loadRule(). This last one is the key here, it allows one rule to request another one to be loaded and get its object. Change-Id: I2881854e33cd3b41565dd1e16aaba1484ef765db
* | | ADT GLE2: add 'Show In' submenu to canvas' context menu.Raphael Moll2010-07-201-0/+12
| | | | | | | | | | | | Change-Id: Ibad11e7872c529e3154b8f0abbfd02d26cac52cc
* | | merge from tools_r7The Android Open Source Project2010-07-191-0/+1
|\ \ \ | |/ / | | | | | | Change-Id: I2fb70c442aa1ec41ac23c8f0842e0e8e66c21f13
| * | Fix DDMS's dependencies in the feature declaration.Xavier Ducrohet2010-07-191-0/+1
| | | | | | | | | | | | Change-Id: I215862930f2336b59e6d733bff4ed9dffcca58d8
* | | Merge "First commit... Ignore *.java files, they are there just so it builds."Xavier Ducrohet2010-07-1933-0/+804
|\ \ \
| * | | First commit... Ignore *.java files, they are there just so it builds.Konstantin Lopyrev2010-07-1633-0/+804
| | | | | | | | | | | | | | | | Change-Id: Ibf159c32cee7a770f1c36f387fe646d9ecabe168
* | | | merge from tools_r7The Android Open Source Project2010-07-192-4/+1
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: Ia6f192ecc0d58aff08a1aa896200de65e2899ac0
| * | | Disable setDerived(true) on linked library source folders.Xavier Ducrohet2010-07-192-4/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | It turns out it's a bad idea as the user will get a warning when editing the files in the linked folder. Eclipse documentation says that Team plug-ins should handle the linked folder and not add them to the repository. Change-Id: I1f439cf2007a730a4d857ff98283311b1cf36afd
* | | ADT GLE2: delegate drop events from Outline to Canvas.Raphael Moll2010-07-182-62/+222
| | | | | | | | | | | | Change-Id: I19c108ec3f242a88e750522cf2acfdd017318937
* | | ADT GLE2: drag from Outline view.Raphael Moll2010-07-175-126/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The drag source listener delegates the handling to the canvas. Changed the OutlinePage2 to no longer listen to parts activations. Instead there's one instance of OutlinePage2 per instance of the GraphicalEditorPart and the link is provided in the constructor directly. Change-Id: I8bee65b2a7f75bd1436082c9a9753c561d8a6cab
* | | ADT GLE2: Link outline's context menu to active canvas' menu.Raphael Moll2010-07-174-9/+256
| | | | | | | | | | | | Change-Id: I29712077a340276f0cde0c9c1ecf75f2e931e515
* | | ADT GLE2: cut/copy/delete/select-all global actions.Raphael Moll2010-07-166-296/+555
|/ / | | | | | | | | | | | | Also provides a linked context menu for the canvas. Paste action is in the menu but will be implemented in a next CL. Change-Id: Iccd3663b5e0db16f44ae2f9a0c2c9271926fe8c2
* | Merge "Improve library link/unlink again."Xavier Ducrohet2010-07-152-369/+349
|\ \
| * | Improve library link/unlink again.Xavier Ducrohet2010-07-152-369/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved library list added to the bundle by comparing the old and new library list when something changed. This is the only way to ensure that all indirect libraries are added removed. Since it means we now have a list of added and a list of removed libraries, the link and unlink methods are merged into a single updateLink method that does it all. This also means that there's only one type of action bundle, so the class/fields name have been updated to reflect the new way it's done. Change-Id: I808a8f1536171ebebca3a9bb5370e9dc0b6433d5
* | | Merge "Add new exceptions to ddmlib."Xavier Ducrohet2010-07-1512-170/+413
|\ \ \
| * | | Add new exceptions to ddmlib.Xavier Ducrohet2010-07-1512-170/+413
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AdbCommandRejectedException is thrown when adb doesn't respond to the command with OKAY. This used to throw a normal IOException but it can be useful to throw a different type. The message of the exception is the error string returned by adb. - ShellCommandUnresponsiveException is the new "timeout" exception for output received by shell command running on devices. This makes the distinction between timeout when talking to adb and issue with shell command not outputting anything. Also made the javadoc for the IDevice.executeShellCommand clearer to what the "timeout" (renamed to maxTimeToOutputResponse) does. Also added a better timeout to the IDevice methods to install/uninstall apps as the default 5sec timeout was likely to be too low. Current default value is 2min. Change-Id: I4ecb9498926295a4e801e71b33df5d611e8120b8
* | | | Merge "Force recompilation after library changes and fix some ↵Xavier Ducrohet2010-07-1518-78/+81
|\ \ \ \ | |/ / / |/| / / | |/ / clean-up/refresh issue in the builders"
| * | Force recompilation after library changes and fix some clean-up/refresh ↵Xavier Ducrohet2010-07-1318-78/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue in the builders One of the fix is that the gen folder is no longer deleted on clean (or full build) which should reduce errors where eclipse complain the gen folder is missing even though it's present. Also move ProjectState into SDK as it's really only managed by the SDK and it allows us to move its constructor to package private. Change-Id: I321ac23f756652e7082297d2ef560a654e97cf67
* | | Add support for specifying adb timeout in ddms testrunner.Brett Chabot2010-07-145-2/+27
| | | | | | | | | | | | | | | | | | Also handle TimeoutException in ADT test runner. Change-Id: I585c2818f1c77ec80222bad282ae10b3ee8f5e1c
* | | Fix some javadocs regarding the timeout API change.Xavier Ducrohet2010-07-132-4/+10
| | | | | | | | | | | | Change-Id: I7e96c253aa07b124bceab99b6f5ce11e17f7b950
* | | Merge "Fix how the default.prop modifications from the UI are reloaded."Xavier Ducrohet2010-07-139-351/+478
|\ \ \ | |/ /
| * | Fix how the default.prop modifications from the UI are reloaded.Xavier Ducrohet2010-07-139-351/+478
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UI to edit the target and library changed the ProjectState directly, causing havoc on the filelistener which *must* be the entry point to reload modification into ProjectState. This patch makes the UI work on a copy of the properties which are then saved separately from the ProjectState (whose save() method disappeared). A next patch will enforce the ProjectProperties of the ProjectState to be read only so that this does not happen again (forcing to clone it before modifying/saving it). This patch also fixes the reloading/relinking of the libraries upon modification of the default.prop but more work is needed here. Change-Id: Ie6a23111242005eb91b7533b506c029ba602f0f3
* | Merge "Fix a possible deadlock in Eclipse/ADT."Xavier Ducrohet2010-07-1313-281/+415
|\ \ | |/ |/|
| * Fix a possible deadlock in Eclipse/ADT.Xavier Ducrohet2010-07-1313-281/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is that sometimes phones will stop responding to shell commands launched through adb. One of these commands is executed in DeviceMonitor#queryNewDeviceForInfo However this is done from a loop that acquires a lock that is used in other places, including building. This basically renders eclipse useless as Eclipse will refuse to do anything until the build is finished. The fix is twofold: First, move the call to queryNewDeviceForInfo outside of the synchronized block. This fixes the deadlock issue but this will not fix the problem that the device monitor will still be stuck with a shell command that never returns. The second part of the fix is to add a timeout to shell command execution. Additionnaly, this patch contains a lot of clean up of the adb API in ddmlib, especially around exceptions thrown during timeout. Change-Id: Ice8ef787c825e0e7b535ff0bb939bf6f25e3d7e4
* | Merge "Remove the modal dialog that showed when ADT start with no SDK setup."Xavier Ducrohet2010-07-124-13/+3
|\ \