aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | merge from tools_r8The Android Open Source Project2010-10-2715-12/+174
|\ \ \ | | |/ | |/| | | | Change-Id: Id7dbdfae280b98547f9a80e07cc5d80d7f9f92f7
| * | Merge "Fix resource issues in ADT." into tools_r8Xavier Ducrohet2010-10-2715-12/+174
| |\ \
| | * | Fix resource issues in ADT.Raphael2010-10-2715-12/+174
| | | | | | | | | | | | | | | | Change-Id: I744833ec03d0d379ea526c193549f99f25f6811a
* | | | merge from tools_r8The Android Open Source Project2010-10-275-15/+272
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | Change-Id: I907004c9f3c55a7e454e0bca644fa4efe200f15b
| * | Merge "ADT: Separate manifest test for AttrsXmlParser." into tools_r8Raphael Moll2010-10-275-15/+272
| |\ \ | | |/ | |/|
| | * ADT: Separate manifest test for AttrsXmlParser.Raphael Moll2010-10-275-15/+272
| |/ | | | | | | Change-Id: I8ea1a31fd7db849fffb9043c58a91f82444d98d4
* | Merge "Add dictionary to codebase"Tor Norbye2010-10-278-18/+140
|\ \
| * | Add dictionary to codebaseTor Norbye2010-10-278-18/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse has the ability to spellcheck comments, and it ships with an English dictionary. However, many valid terms in our codebase is not in this dictionary. This checkin adds a dictionary file which contains many of the valid spelling words used in our codebase. (Unfortunately, Eclipse does not support "project dictionaries" like some other IDEs where individual user dictionaries are merged with shared project dictionaries. However, this new dictionary should be useful for developers who use a dedicated workspace for Android development.) This changeset also fixes some typos. Change-Id: Ied6647f6cb550460c0087498f8c94fa6624e3b4e
* | | merge from tools_r8The Android Open Source Project2010-10-271-1/+1
|\ \ \ | | |/ | |/| | | | Change-Id: I2f8e8e1257fb51c2fda1617804fa6136526b426c
| * | Merge "ADT: Fix display of unknown Manifest elements." into tools_r8Raphael Moll2010-10-271-1/+1
| |\ \
| | * | ADT: Fix display of unknown Manifest elements.Raphael Moll2010-10-271-1/+1
| |/ / | | | | | | | | | | | | | | | SDK Bug: 3135772 Change-Id: I4f7c84c20b31e70db20a202f168158d500b3c09d
* | | merge from tools_r8The Android Open Source Project2010-10-262-1/+16
|\ \ \ | |/ / | | / | |/ |/| Change-Id: I301171df40d831b03ba3563e72a3910dd6d6951e
| * Merge "ADT: Exclude <include> tag from the GLE palette." into tools_r8Raphael Moll2010-10-262-1/+16
| |\
| | * ADT: Exclude <include> tag from the GLE palette.Raphael Moll2010-10-262-1/+16
| |/ | | | | | | Change-Id: Ia318556bc88a823fb6eae9048634c824524f3b90
* | merge from tools_r8The Android Open Source Project2010-10-264-5/+112
|\ \ | |/ | | | | Change-Id: Ibdee0b6cb56b39ccfe1c604f8300f94c81320590
| * Merge "SDK: Fixed proguard.bat & co." into tools_r8Raphael Moll2010-10-263-0/+51
| |\
| | * SDK: Fixed proguard.bat & co.Raphael Moll2010-10-263-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | These are similar to the external/proguard/bin/*.bat except they use $SDK/tools/lib/find_java.bat to locate the java location and use it if available. find_java will print a proeminent error if java cannot be found. Change-Id: I1fceae838436053031f405de9b3f1ab2d64222e6
| * | Merge "ADT: fixes to make Proguard work under Windows." into tools_r8Raphael Moll2010-10-261-5/+61
| |\ \ | | |/
| | * ADT: fixes to make Proguard work under Windows.Raphael Moll2010-10-261-5/+61
| |/ | | | | | | | | | | | | | | | | | | | | | | | | - the proguard.bat can only pass 9 args, but we have 15+, so we'll use a temporary proguard config file for Windows. - PROGUARD_HOME needs to be defined properly since the default proguard.bat cannot infer it properly. We need other fixes to that batch file so eventually we're not going to ship the default one and we can fix the .bat file, but properly defining this env var is probably a good idea anyway. Change-Id: Id007d5504a5e05d1c4b5a0728e96e0d677978ef4
* | Merge "Support 3rd party layout rule loading, and rip out Groovy support"Tor Norbye2010-10-2628-721/+136
|\ \
| * | Support 3rd party layout rule loading, and rip out Groovy supportTor Norbye2010-10-2628-721/+136
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for loading 3rd party .jars providing additional layout rules. This can be configured by adding a property referencing the jars to be loaded as part of your build.properties, like this: default.properties: ... layoutrules.jars=chart-rules.jar:graph-rules.jar ... This will create a class loader referencing chart-rules.jar and graph-rules.jar (as well as the visual editor's plugin class loader as a fallback), and this class loader is used to load IViewRule implementations. In addition, this plugin rips out the various remaining Groovy hooks and references that were earlier used to load Groovy scripts as layout rules, and removes groovy from the load path and build symlinking scripts. Change-Id: Ia17a60259559ec86270726add258382a879117dc
* | merge from tools_r8The Android Open Source Project2010-10-252-23/+44
|\ \ | |/ | | | | Change-Id: If3f0a5d9b487e23c8f28fc4db676b0cb70d09c5a
| * Merge "Fix external jar support when building with proguard." into tools_r8Xavier Ducrohet2010-10-252-23/+44
| |\
| | * Fix external jar support when building with proguard.Xavier Ducrohet2010-10-252-23/+44
| |/ | | | | | | Change-Id: I3dafb284770f475d70a212cbe22cdae6bff36ff7
* | Merge "Add layout unit tests"Tor Norbye2010-10-2519-6/+1742
|\ \
| * | Add layout unit testsTor Norbye2010-10-2519-6/+1742
|/ / | | | | | | | | | | | | Add layout unit tests, and some infrastructure for testing. Also fix some formatting errors (>100 column lines) in the previous commit. Change-Id: I3eabf30998ab7deb84df57e4d0c10cf57ee399d5
* | Merge "Port layout rules to Java"Tor Norbye2010-10-2476-2032/+2678
|\ \
| * | Port layout rules to JavaTor Norbye2010-10-2276-2032/+2678
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a number of layout implementations in the tool written in Groovy; these were hard to deal with because of lack of good tool support (debugging didn't work, refactoring didn't work, code completion didn't (always) work, go to declaration didn't work, semantic checks like unused code didn't work, etc. etc.) Since these layout helpers are only getting larger, replace them by equivalent Java code to make development easier. This checkin also moves the API classes formerly used by Groovy scripts into a new package (next to the Java layout rules) under com.android.ide.common (api and layout) since this code isn't Eclipse specific and could be used by other IDE vendors. These interfaces were left identical (only the package statements and directory location changed), with two exceptions: I added a new method called "in" to IAttributeInfo.java, and I added a parameter to IViewRule's onInitialize method. The Groovy code was kept as close to the original as possible; I copied in the Groovy code, and then replaced the Groovy-specific constructs (closure-iteration on collections, literal map syntax, etc) with equivalent Java code. The only tricky part was ensuring that Groovy's handling of the == and != operators were translated into .equals calls. Change-Id: Idf7660ddea3766eac0a4a65ce6524d3f5119f7b2
* | merge from tools_r8The Android Open Source Project2010-10-221-1/+1
|\ \ | |/ | | | | Change-Id: I5d09a769d021b995afde56faef4d757124bef5e1
| * Merge "Remove temporary disabling of proguard during ADT export." into tools_r8Xavier Ducrohet2010-10-221-1/+1
| |\
| | * Remove temporary disabling of proguard during ADT export.Xavier Ducrohet2010-10-221-1/+1
| | | | | | | | | | | | Change-Id: Iadff55b838b7317f9dcc518d5246a2889f7a5f39
* | | merge from tools_r8The Android Open Source Project2010-10-211-0/+8
|\ \ \ | |/ / | | | | | | Change-Id: Ic11d6314c05e66d9c60a53dcdb88b8de279a3d5b
| * | Merge "Workaround failure to collect test info for large test suites." into ↵Xavier Ducrohet2010-10-211-0/+8
| |\ \ | | |/ | |/| | | | tools_r8
| | * Workaround failure to collect test info for large test suites.Brett Chabot2010-10-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add a small delay between tests when collecting test info. Bug 1796494 Change-Id: I57061d7a21f8c8517c03101e28a3de82cdd61cd8
* | | merge from tools_r8The Android Open Source Project2010-10-200-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I139ff9bb81b703f7fa305b1234e3c6330012d3f8
| * | Merge "Integrate 6db57208 into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-2015-37/+1108
| |\ \
| | * | Integrate 6db57208 into tools_r8. DO NOT MERGE.Bill Napier2010-10-2015-37/+1108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial cut at MonkeyRecorder. MonkeyRecorder (and MonkeyPlayback) are a set of tools for using MonkeyRunner to record and playback actions. The current implementation is not very sophisticated, but it works. Please don't review yet. Needs a lot of style cleanup. Change-Id: I79ed1b548d295563a184af5fb945140f93586b17
| * | | Merge "Integrate 5397067d into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-201-1/+19
| |\ \ \ | | |/ /
| | * | Integrate 5397067d into tools_r8. DO NOT MERGE.Bill Napier2010-10-201-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | Fix field visibility by ensuring they stay in __dict__. Change-Id: I2e93dd4ba8c8cc3f05ca477091932268ec5d78da
| * | | Merge "Integrate 17398174 into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-203-3/+30
| |\ \ \ | | |/ /
| | * | Integrate 17398174 into tools_r8. DO NOT MERGE.Bill Napier2010-10-203-3/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | Make MonkeyRunner's adb finding more robust. This includes fixes for running out of the SDK. Change-Id: Ie73ccd391b34f8a75f23738a97c42902f91af841
* | | merge from tools_r8The Android Open Source Project2010-10-201-6/+0
|\ \ \ | |/ / | | | | | | Change-Id: I50e3e6ada3a357bd519d5ccd7465ca236a525b84
| * | Merge "Gen folder should not be derived." into tools_r8Xavier Ducrohet2010-10-201-6/+0
| |\ \ | | |/ | |/|
| | * Gen folder should not be derived.Xavier Ducrohet2010-10-201-6/+0
| |/ | | | | | | | | | | | | | | This fix the issue where gen is not present after project creation (it was actually created then deleted as part of a clean up phase) Change-Id: I25cd67c076ed401b482d97292640c08a2a7a5830
* | Merge "Fix ddms filechooser behavior and Mac accelerator"Tor Norbye2010-10-193-6/+32
|\ \
| * | Fix ddms filechooser behavior and Mac acceleratorTor Norbye2010-10-193-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a couple of issues in ddms: First, fix the code to remember the path you last opened the file chooser with; if there is nothing in $lastImageSaveDir, it should look at $imageSaveDir (which is the variable the default setting ($user.home) is initialized into). Second, and this seems to be Mac specific, the FileDialog.getFilterPath() call does not return the path you have navigated to, which means that on the Mac it never sets $lastImageSaveDir correctly - it always sets it to the original suggestion. The fix is trivial - use File#getParent instead which does the String manipulation to extract the parent portion of a string which represents a path. Finally, on Macs (only), make the keybindings use the Command key instead of the Control key since that's the norm. Change-Id: I1b0f381606f5373ddad973754e49ce07856a9bae
* | | merge from tools_r8The Android Open Source Project2010-10-190-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I9a270a8b095100a7ff54338d60aa3990ec46b677
| * | Merge "Integrate 9174add7 into tools_r8. DO NOT MERGE" into tools_r8Xavier Ducrohet2010-10-191-1/+5
| |\ \
| | * | Integrate 9174add7 into tools_r8. DO NOT MERGERaphael Moll2010-10-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK Manager fix: message to restart after tools update. The latest CL made this appear after a platform-tools update instead. Change-Id: Ib52cf88adfb1557c112c3a8153dad536c5932fa3
| * | | Merge "Integrate 5b6aa7d0 into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-191-1/+4
| |\ \ \ | | |/ /