aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
Commit message (Collapse)AuthorAgeFilesLines
* Move Pair and annoatations into resources.jar now renamed as common.jarXavier Ducrohet2011-01-2816-212/+20
| | | | | | | Move all the resource query methods that returned an array of 2 Strings to return a pair of ResourceType and String. Change-Id: I6b8447aa27005de786e2defef81ad88a72363523
* Update the Layoutlib API to contain part of the current config.Xavier Ducrohet2011-01-2719-1173/+13
| | | | | | | | | | | | | | | | | | Right now only the screen size is needed. We can add more to Params as needed. Since we should use the existing enum classes for this, I moved all the current enum from sdklib into a new jar file called resources.jar. ADT, sdklib, layoutlib_api all depend on it. Changes to resources should always be API compatible and the result should be copied into the in-dev platform branch in prebuilt, similar to layoutlib_api. See the README.txt files in layoutlib_api/ and resources/ Change-Id: I877ba3cad555ec497954bb0866639e51e7751020
* Add renderscript support to the Ant build system.Xavier Ducrohet2011-01-183-0/+22
| | | | Change-Id: Iba1c956d33725716923da89b788f7f8d14524e41
* Parse the manifest min/targetSdkVersion to configure the layoutlib.Xavier Ducrohet2011-01-181-6/+38
| | | | | | | | This is needed to configure ApplicationInfo in the layoutlib so that some widgets properly apply different behaviors based on the app targetSdkVersion. Change-Id: Ic78af4390d1b871469583f3efc0de3a9da718a6c
* Merge "Make the default skin a bit more dynamic based on the platform." into ↵Xavier Ducrohet2011-01-161-2/+11
|\ | | | | | | tools_r9
| * Make the default skin a bit more dynamic based on the platform.Xavier Ducrohet2011-01-161-2/+11
| | | | | | | | Change-Id: I37db0034cc106b573f0efb844cae074cb63ba588
* | Merge "Fix in SdkSources."Pierre Zurek2011-01-151-1/+1
|/ | | | | | | | | For User Add-ons, the counter used to save the urls was starting at one while the counter used to load them was starting at zero. Now they all start at zero. Change-Id: Iff5204efe34d69ee8bcc3a4f11c8cc0de4ea7c29
* Fix MockLog to build on 1.5Xavier Ducrohet2011-01-121-3/+0
| | | | Change-Id: Icbdbbae2fe105af6eb1cdb1490a2415007262980
* Merge 74f725db from master: Add snapshot handling for AVD creation, details, ↵Tim Baverstock2011-01-1214-81/+643
| | | | | | | | and launch Also respect 'Wipe User Data' by disabling snapshot launch, and support 'Edit AVD'. Change-Id: I2fee9361d78d70b80314523e36b48fbd80b03ca7
* Merge into f9297748 r9: Handle Animator and Interpolator resources.Xavier Ducrohet2011-01-111-0/+4
| | | | Change-Id: I85242fb436e7de99887bd60b320a16a051bddc51
* Cleanup ArrayList usage in SDK Manager.Raphael Moll2011-01-074-30/+34
| | | | Change-Id: If8e3adec4a23456f5f31be96aa959048a698d225
* SdkManager: suggest which platform to install to fix a broken addon.Raphael Moll2011-01-0710-12/+349
| | | | | | | | | | | | | | The SDK Manager now has the notion of a "broken installed package". The BrokenPackage can specify that: - it requires a certain minimal platform to be installed, and/or: - it requires a specific exact platform to be installed. The later constraint is expressed by IExactApiLevelDependency and allows UpdaterLogic to find which platform would fix an addon which is missing its base platform. Change-Id: If429ea39f0ddc19c0cb906bf6766df310de28981
* Merge "Fix NON-NLS tokens"Tor Norbye2011-01-061-1/+1
|\
| * Fix NON-NLS tokensTor Norbye2011-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | There were a number of // $NON-NLS-1$ references in the codebase. Eclipse's "Externalize Strings" functionality will not handle these correctly; there must not be a space between the "//" and the "$NON" tokens. (I left AndroidXmlEditor.xml alone; it is the file I discovered the problem in but I fixed those references as part of another pending checkin.) Change-Id: If185c88a667273af614f0bee5959fd2618756c05
* | Merge "Support broken addons in SDK Manager UI."Raphael Moll2011-01-0611-194/+626
|\ \
| * | Support broken addons in SDK Manager UI.Raphael Moll2011-01-0611-194/+626
| |/ | | | | | | Change-Id: Idec7365e440e865a8225ed6f0c9c156206141d73
* | SDK Manager: specify proxy on no-UI command-line.Raphael Moll2011-01-065-18/+115
| | | | | | | | | | | | | | | | | | | | | | | | This adds 2 flags to specify the http/https proxy host/port on the command line when using the console-base "no-ui" SDK update. The command-line proxy values override settings if defined. Also revamped the argument help display to support larger command-line long argument sizes and mandate that arguments can have one of ther short or long argument name optional. Change-Id: I87cc535ab369602a5c02c7a938b0e4f4736c0040
* | Load and apply proxy settings from config file in UpdateNoWindow, allowing ↵Christopher Orr2011-01-061-1/+6
| | | | | | | | | | | | headless updates to work behind a proxy. Change-Id: I0deb8981c5fec0c7ae3eddbbde529537c02fdc1c
* | Set 'https' proxy system properties using the 'http' settings, allowing ↵Christopher Orr2011-01-061-5/+13
|/ | | | | | downloads via an HTTPS proxy to work. Change-Id: I95fd0f377df4ff4372e8a7ca18cfc4195bbfc177
* Minor method rename in SdkManager UI.Raphael Moll2011-01-033-4/+7
| | | | Change-Id: I35447fe1ae9a21763207a07c0e205c1808f3b420
* Move Pair<,> from ADT to SdkLib.utilsRaphael Moll2011-01-031-0/+107
| | | | Change-Id: I5c37e4b4dd83bc239ed242709ede70982f14705f
* SDK Manager in ADT: make it possible to unload the SDK.Raphael Moll2011-01-037-71/+219
| | | | | | | | | | | | | | | One of the issues when using the SDK Manager from Eclipse is that, at least on Windows, we can't upgrade the platform-tools or the targets since they might be locked by ADT. Typically dex.jar is in use and typically we have various data/res (ttf and xml) files used by any opened layout editor. This adds the necessary infrastructure to know in ADT when packages are going to be installed. There's a crude attempt to solve the dex.jar issue. However unloading the targets isn't done yet. Change-Id: I5c48144501c7f39ef779bfeffdfae85a48c65a29
* SDK Manager: Rework install logic.Raphael Moll2011-01-0313-177/+406
| | | | | | | | | | | | | | | | | | | | | | | | This should get rid of the annoying behavior on Windows that prevent the "folder swap" operation due to the folders being locked. Cf public issue 4410. High level summary of the issue and the fix: the old behavior was to unzip in a temp folder, then rename the old folder to another temp file and finally rename the new folder at the desired location. This fails typically when there is a file indexer (e.g. anti-virus) scanning the new folder so we can't move that folder. The new logic is to try to move the old folder first into a temp folder. If the fail move, we have a lock on the old folder and ask the user to fix it manually. They probably have a file opened and it's a legit issue to report. Once that succeeded we can directly unzip the archive into the final destination without using a temp unzip location, thus avoiding the common "indexer in progress" issue. In case the unzip operation fails, we try to copy (not move) the old folder back. Change-Id: I5ed67ff626532fe7cc48a45e87d1dbaf6954f28a
* SDK Manager: Split install logic out of the Archive class.Raphael Moll2011-01-033-737/+791
| | | | Change-Id: I669229ad6d8906ca654c9be5e3416360cc7a5fb5
* Fix android.bat to properly cd to temp dir.Raphael Moll2010-12-281-1/+1
| | | | | | | | Fixes an issue when the SDK is not on the same drive than the temp dir that android.bat uses. Reported on http://code.google.com/p/android/issues/detail?id=4410 Change-Id: I993ea550056bda2c696c28bfa135aa186aad7a05
* Edit AVDs in AVD Manager.Raphael Moll2010-12-194-22/+203
| | | | | | SDK Bug: b.android.com/13276 Change-Id: I495cd8cb9e4287a7cb14a3797e5b9d3b3e07160b
* Make AvdCreationDialog compatible with WindowBuilder.Raphael Moll2010-12-191-0/+7
| | | | Change-Id: I5fca1db1625eff1ff98940fcf68475a80a8f361c
* Fix to edit window with WindowsBuilder.Raphael Moll2010-12-161-3/+15
| | | | Change-Id: I19e6933abac980cf688860e37436455bd5787909
* Remove broken assert.Xavier Ducrohet2010-12-091-1/+0
| | | | | | The assert can be false in normal condition. Change-Id: I7181556e3ba32f765eca8e14997622557402a2da
* Cleanup refactoring.Raphael Moll2010-12-061-1/+1
| | | | Change-Id: I5641a9238129558b269c3f8a27a5b4de54e9db44
* Contribute android changes to Rename package, Rename Type and Move Type Java ↵snpe2010-12-022-0/+4
| | | | | | refactoring Change-Id: Iad4dd015eb2164dcd888a96bafa256d89711d49d
* Unit test fixesTor Norbye2010-11-241-2/+4
| | | | | | | | | | | | | | | | | | First, the AddonsListFetcherTest#testLoadSample_1 was failing on the Mac, because the source code contained non-ASCII unicode characters, and the encoding differs between Windows, Linux and Mac -- and on the Mac the characters were garbage (not the intended Japanese characters). Fixed by using unicode escape sequences to define the expected output instead. Second, rename the AbstractLayoutTest to LayoutTestBase; the test runner (for plugins, not unit tests) was assuming this was a test case (even though it's an abstract class!) so it was emitting a warning about the class containing no test cases. This is simply a base class for all the individual layout tests defining a bunch of useful inherited shared behavior, so rename to avoid the warning. Change-Id: I6e29316c5644db35051218aef8b99ac41ab0cda4
* Remove some asserts.Raphael Moll2010-11-233-11/+13
| | | | Change-Id: I8458dc9237506c542c766e6119261ae4e13b453b
* Remove AdtPlugin dependency from AttrsXmlParser.Raphael Moll2010-11-174-16/+38
| | | | | | | | | | | | The AdtPluin was used just for logging. Instead the AttrsXmlParser takes an ILogger (AdtPlug implements ILogger and can be used directly in unit tests too). For unit tests there is a new StdSdkLog convenience class that prints to stdout/stderr (formerly MockStdLogger from the Sdk Manager was doing that.) Change-Id: I658af61d04efb19ad6e3bf9c0bf471452372885a
* merge from tools_r8The Android Open Source Project2010-11-0411-81/+249
|\ | | | | | | Change-Id: I7bc7385266c44927db9dc66eed3b06e92eaf99e1
| * SDK Repo Schema: <vendor> for <extra> elements.Raphael Moll2010-11-0311-81/+249
| | | | | | | | Change-Id: I8fa13d28b787e3ecb8bd96896e6410313e2a66a9
* | merge from tools_r8The Android Open Source Project2010-10-295-22/+89
|\ \ | |/ | | | | Change-Id: If932f5db0eb1d3b8caf49a2f18bc94b84eab9e3f
| * SDK Manager: fix suggestions of new platforms.Raphael Moll2010-10-285-22/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I accidentally broke the way the SDK Manager was suggesting new platforms when I "optimized" the way it was fetching new sources when resolving dependencies. The fix is that even if we don't need to refresh or fetch a source, we still need to report the packages we know it contains. Also made the Archive and ArchiveInfo implement Comparable and defer their comparison to the one of Package. This way we can sort the archives in the install window. Change-Id: Ic3b39e49e8143541b19b00de09468c1b3f01b0d7
* | merge from tools_r8The Android Open Source Project2010-10-272-1/+3
|\ \ | |/ | | | | Change-Id: Id7dbdfae280b98547f9a80e07cc5d80d7f9f92f7
| * Fix resource issues in ADT.Raphael2010-10-272-1/+3
| | | | | | | | Change-Id: I744833ec03d0d379ea526c193549f99f25f6811a
| * 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
| * Integrate 5b6aa7d0 into tools_r8. DO NOT MERGE.Raphael Moll2010-10-191-1/+4
| | | | | | | | | | | | SDK Manager: addon schema version number in about box. Change-Id: I35d4e1db042282e269e3d1247d36ffa0e44291d5
| * Integrate 11357696 into tools_r8. DO NOT MERGERaphael Moll2010-10-181-10/+9
| | | | | | | | | | | | SDK Manager: Restart ADB after platform-tools update. Change-Id: Ie59201a3f303e1a9a837e82cbf4a83f620b4e7f2
* | Support 3rd party layout rule loading, and rip out Groovy supportTor Norbye2010-10-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | SDK Manager fix: message to restart after tools update.Raphael Moll2010-10-191-1/+5
| | | | | | | | | | | | The latest CL made this appear after a platform-tools update instead. Change-Id: I5e27612b3fa6fd7e53cd10a369b2d5eba19a168b
* | SDK Manager: addon schema version number in about box.Raphael Moll2010-10-191-1/+4
| | | | | | | | Change-Id: I2a54180f46e52cba931154ae57826c6df22b6a07
* | Update application icons for sdkmanager and ddmsTor Norbye2010-10-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the dock icon used on Macs for the sdkmanager to one that has transparency, just as the emulator icon already does. This is the norm on Macs. Update the application icon used for ddms to be an android with a wrench, in a similar style to the other tool icons. This icon is also transparent, which I hope will work on Windows - it would be great if Raphael could verify that (and I should probably try to get a Windows image into my VMWare install so I can do these checks myself in the future.) Change-Id: Icd0954cb77ba0845034a79bf9df6dd271019632e
* | SDK Manager: Restart ADB after platform-tools update.Raphael Moll2010-10-181-10/+9
|/ | | | Change-Id: Ie4e21e2922d2b281723a4ee3b5aeb1c3c646beba
* DexWrapper is now loaded by the SDK instead of the platforms.Xavier Ducrohet2010-10-181-2/+6
| | | | | | | | | | | Since tools_r8, dx.jar is now located in platform-tools. instead of platforms/android-<API>/tools/lib/. There is therefore no need for all the platforms to load their own dx.jar through reflection into DexWrapper. The SDK now does it for all, and the builders query the SDK for the wrapper. Change-Id: Ia79ccaf95237f2b25b43f26241e6335acc7050a3
* Merge "SDK Manager: refuse to not install dependencies."Raphael Moll2010-10-184-39/+97
|\