aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cherrypick 9dd123 from master. do not merge.Xavier Ducrohet2011-09-282-5/+43
| | | | | | | | Fix migration to new library projects. Also fixed a minor NPE. Change-Id: Ie76f0120c63b37579b57b32b3b4af005f388a0b0
* Merge "SDK repository: support for source packages. Do not merge." into ↵Raphael2011-09-2720-66/+750
|\ | | | | | | tools_r14
| * SDK repository: support for source packages. Do not merge.Raphael2011-09-2720-66/+750
| | | | | | | | | | | | (cherry picked from commit d963b52229e2d1a3875698e5d2822f00df3485c9) Change-Id: I249fafe24795b94294c9f9251713c1028a3d9199
* | Tools r14 require ADT 14.Xavier Ducrohet2011-09-271-1/+1
|/ | | | Change-Id: If07afb667f0b748e859e2e8b70aa1bcc74f0acfe
* Welcome Wizard tweaks. Do not merge.Tor Norbye2011-09-262-6/+87
| | | | | | | | | | | | Use Yes/No radio buttons in the Usage Statistic page rather than a checkbox, and validate that one of the options are chosen such that the Finish button on page 1 is not enabled. Also add the Android icon to the wizard. (cherry picked from commit f5368be1b6cd95fd0ff065a1c624d812b8a260dd) Change-Id: I4950f33921ba99ac4ec657adb477395c1cda0a07
* Change welcome wizard string. Do not merge.Raphael2011-09-261-1/+1
| | | | | | (cherry picked from commit 1632530362278dd0f0613bb0e7cfc67240cbaf59) Change-Id: Iabfdc90a6941ffb62adc061af9d4cf5e24505e8e
* Welcome wizard: validate when install common checkbox changed. Do not merge.Raphael2011-09-241-0/+1
| | | | | | (cherry picked from commit 9e0c3a1110b123bd67befc1dd21a56c5f4bcd5ec) Change-Id: I0e202549e7b8410bf4fe9c71e872cc3ad1d2fa30
* Prevent new install of tools from displaying update msg. Do not merge.Raphael2011-09-2410-30/+97
| | | | | | (cherry picked from commit 2a94ac98f9079e083ca88037b38244b5b5a46d7f) Change-Id: Iee30e19c591cb375104fbcbeb3474c52a47df465
* First time install: multiple platforms, fix shell disposed. Do not merge.Raphael2011-09-246-119/+204
| | | | | | | | | | | | | | | | | | | | | | Fixes for the first time install support: - Support installing more than one platform. The custom install task was tailored before to one install a single package and return one status with on archive install path. This has been made more generic. - Fix a couple occurences of the dreaded "SWT Shell disposed" error that happen when updating the progress bar and closing the window at the same time. The issue is that I was checking isDisposed before starting a syncExec but the window can be closed between the moment the syncExec is schedule and when it happens so code must check again for isDisposed inside the syncExec. (cherry picked from commit 949dc34d6202ec5e318c30992bc11b61e0c64808) Change-Id: I08976f2fcbba68f5371e410ffe8c741c1fa2c2dd
* Welcome Wizard. Do not merge.Tor Norbye2011-09-2411-98/+804
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds a new "Welcome Wizard" which is shown the first time a user runs Eclipse with the ADT plugin. The welcome wizard asks for two pieces of information: (1) The location of the SDK. (2) Whether the user agrees to gathering usage statistics. We've needed this information before, but collection of the data had been more ad-hoc: The usage data permission dialog would show up on its own, and the SDK information would be requested the first time some code path touched it (e.g. opening a layout or opening the preference dialog's Android page etc). In addition, the wizard also offers to *install* SDKs if you don't already have one. It gives the option between the latest available platform, and one supported by a large majority of devices (currently API level 7), or both. If you select this option, then when finishing the wizard the SDK manager is run in a special mode where it installs the required packages with a progress dialog. This changeset also starts recording the chosen SDK location in the ~/.android settings file. This allows us to detect when you're running Eclipse in a brand new workspace and you've already gone through the SDK selection before, and we don't need to ask again -- we'll just use the most recently known location. The wizard will only be shown once. If you bypass or cancel out of the wizard, you can still configure your SDK the old way - via the Preference dialog. Note also that the usage permission page is only shown if the user has not already opted in via say ddms. NOTE: If you want to test this, make sure you haven't set the environment variable ADT_TEST_SDK_PATH (as some of us do for running unit tests) since it is treated as the user having selected the given SDK root, and in particular it means the wizard won't be shown even if you've wiped adtUsed=true from your ~/.android/ddms.cfg etc. (cherry picked from commit 292eefb8faa2f75ddbc5d6e20084c9f9a762da29) Change-Id: Idb3f8775ef62a84905cde95b25eeb8691ef0afab
* Merge "Fix ADT build. Do not merge." into tools_r14Raphael2011-09-241-2/+3
|\
| * Fix ADT build. Do not merge.Raphael2011-09-231-2/+3
| | | | | | | | | | | | (cherry picked from commit c75ae5bac912229d8168efb91b117823959bc79d) Change-Id: I14f62f892eac7168d38f787089525d989bf625e4
* | Merge "Address some comments on the DdmsPreferenceStore. Do not merge." into ↵Raphael2011-09-243-39/+44
|\ \ | |/ | | | | tools_r14
| * Address some comments on the DdmsPreferenceStore. Do not merge.Raphael2011-09-233-39/+44
| | | | | | | | | | | | (cherry picked from commit 23e2f89139a9219136f5889ef1228b58bd9e02d6) Change-Id: I65d7bed7a044d31376f592c7dcd9713a4b00262c
* | Merge "SDK: Fix traceview build. Do not merge." into tools_r14Raphael2011-09-241-1/+1
|\ \ | |/
| * SDK: Fix traceview build. Do not merge.Raphael2011-09-231-1/+1
| | | | | | | | | | | | (cherry picked from commit f6c1a87ff7ddabe33ff8d29abb9ec0c0aa5633f6) Change-Id: I254f0d6aba3513d759a6348580e7c1f670aa6d9e
* | Merge "Tweak AdtUpdater dialog to install a fresh new SDK. Do not merge." ↵Raphael2011-09-242-41/+125
|\ \ | |/ | | | | into tools_r14
| * Tweak AdtUpdater dialog to install a fresh new SDK. Do not merge.Raphael2011-09-232-41/+125
| | | | | | | | | | | | (cherry picked from commit 4366a4e8145df82dd570d0c9f2b1c3c4301166a1) Change-Id: I23f4504a5239592db211d5436c252b957ba68503
* | Merge "Extract DDMS PreferenceStore. Do not merge." into tools_r14Raphael2011-09-246-200/+430
|\ \ | |/
| * Extract DDMS PreferenceStore. Do not merge.Raphael2011-09-236-200/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits DDMS PreferenceStore management in a separate class and add the methods we need for ADT first-time wizard. Various pieces of DDMS access the pref store via the PrefsDialog. This could use a cleanup eventually later. (cherry picked from commit f7bc23a0f19d2e3371cbea41d4cf8a1081c9d2d8) Change-Id: Iac37f970e69b7d74d9dd15120b838bcc47ba1caa
* | Merge b927e75 from master. do not merge.Xavier Ducrohet2011-09-231-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | When creating AVDs, check ABI before prompting for hw config. The check verifies the number of available ABIs and the presence of the --abi option (required if 2+ ABIs). This avoid going through all the hardware config to then get an error because --abi is missing. Change-Id: I1c69dec3f2262e5faa8ce8a2d53d01fcafe8a20d
* | CherryPick 67000f from master. do not merge.Xavier Ducrohet2011-09-232-9/+8
|/ | | | | | Fix ADT builder to use the modified ApkBuilder api. Change-Id: Id73c5994748187396d3d9cd21dff3c2efa377504
* CherryPick 2c8cce from master. do not merge.Xavier Ducrohet2011-09-231-0/+5
| | | | | | | | | Fix dependency support for aild. The aidl task doesn't use InputPath so it fails to check files for modifications. Change-Id: I1000c0fad69791461e8021a95214d044fad71674
* CherryPick 15fa2c from master. do not merge.Xavier Ducrohet2011-09-232-13/+122
| | | | | | | | Make the zip align ant step check timestamp on intput/output. If the output is more recent than the input, zipalign does nothing. Change-Id: I51146f0da9697e8f8bfc19e4d6bea80006f101b5
* CherryPick a9a282 from master. do not merge.Xavier Ducrohet2011-09-239-188/+407
| | | | | | Add dependency support for ApkBuilder ant step. Change-Id: Ia51f745f3bb0a91bafe0396804b999a0e39578ea
* Display the full error info for broken packages. DO NOT MERGE.Raphael2011-09-221-5/+14
| | | | | | | | | | | The BrokenPackage contains a "long description" that contains the error (why it is broken). We need to use that and not override it with the base package description. (cherry picked from commit 53c2f0ce0dfac607c6ff3b6350b61ba134cd7eeb) Change-Id: I6a1f1e7047ca8d37ec7c62325d1cd1d2248f6b9f
* Bug fixes for render target selection and project comboTor Norbye2011-09-212-0/+16
| | | | | | | | | | | | | | | This changeset fixes two bugs: (1) Make sure that the default render target chosen for a newly opened layout is the same as the project build target, if the project build target is a preview release. (2) Ensure that the project selector combo updates its selection to show the selected project when it is set (without this there were scenarios where the New XML File dialog would not show the project it had actually found and selected internally. Change-Id: Ia9dd9d75e42f9e8b9d312fc0d951f798c578165f
* Display stack trace for selected Heap Allocation.Siva Velusamy2011-09-208-36/+152
| | | | | | | Minor changes in a few other places to return List's instead of arrays. Change-Id: I25ddc25ebc1c91677d16e9d77dc0f8a51022bc1b
* New implementation of native heap - layout only.Siva Velusamy2011-09-209-3/+707
| | | | Address resolution to symbols to come in future CL's.
* When requesting NHGT, disable NHSG.Siva Velusamy2011-09-201-1/+1
| | | | | | | | | | | NHGT = Native Heap GeT NHSG = Native Heap Segment Data Currently, ddmlib doesn't do much processing of the NHSG data anyway. Adding NHSG causes a stream of segment data updates sent from the client, which is then ignored. Change-Id: Ifb95e9a744cd5c733593abb1bb83446796e7b50a
* Use foreach instead of iteratorSiva Velusamy2011-09-202-10/+4
| | | | Change-Id: I06c3f52313ae06ff2b51cbe6b302409bd4efca5b
* Fix ADT build.Raphael2011-09-201-2/+2
| | | | Change-Id: Ibfa4d889a4194f9b285bc904b9913a811037c3de
* Merge "Enable SDK Repo to use latest XSD versions."Raphael Moll2011-09-194-0/+0
| | | | | | | | | This requires development.git Change-Id If3beb09a to build. Manual cherry-pick of b889a8783158f156bc95ec3c63cccd60e210f1d1. Apparently it wasn't auto-merged automatically. Change-Id: I12f9da8e5348e8524294866f3e400110926e8317
* Merge "Build AVD Manager.exe as part of Windows SDK."Raphael Moll2011-09-193-2/+14
|\
| * Build AVD Manager.exe as part of Windows SDK.Raphael Moll2011-09-193-2/+14
| | | | | | | | | | | | | | Also make sure the sdk manager post install will update the AVD Manager as required. Change-Id: I969899adf69f0ed0ddb1ef079451683dd0ce567f
* | Merge "SDK: change way system image packages are loaded."Raphael2011-09-195-37/+98
|\ \
| * | SDK: change way system image packages are loaded.Raphael2011-09-185-37/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change the system image packages to not care about the directory name of where they are located and instead enforce the presence of a source.properties file. Change-Id: I580a0c04a453297ae7ddf9de8e012fd65d34d776
* | | Merge "Make sure renderscript's -target-api receives 11+"Xavier Ducrohet2011-09-194-8/+23
|\ \ \
| * | | Make sure renderscript's -target-api receives 11+Xavier Ducrohet2011-09-194-8/+23
| | |/ | |/| | | | | | | Change-Id: Id4012b8c86212b3874c0820ba9c71136083cd5f2
* | | Merge "SDK Manager: Extract all source.properties constants."Raphael2011-09-1921-139/+203
|\ \ \ | | |/ | |/|
| * | SDK Manager: Extract all source.properties constants.Raphael2011-09-1821-139/+203
| |/ | | | | | | | | | | | | | | | | | | The SDK Manager uses specific constants to save local source.properties files in installed packages. This moves all these constants in a common constant class and makes it explicit that these constants form some kind of API that can't be changed arbitrarily. Change-Id: I005f13f53768fbcc677edf94be0b4c13e19e3ec8
* | SDK Manager: tooltips on package table.Raphael2011-09-171-8/+144
|/ | | | | | | | | | This adds tooltips to the package table. The tooltip displays the long description of the packages. This is especially useful from broken packages (e.g. those that did not load correctly) since it indicates what failed. Change-Id: I6e53d0959d6dd056414e91d9a27393d989517bd8
* Merge "Specify the full path to atree for the windows.atree"Raphael2011-09-161-1/+2
|\
| * Specify the full path to atree for the windows.atreeRaphael2011-09-161-1/+2
| | | | | | | | | | | | | | | | | | Somehow the build server doesn't automatically find atree. In a future CL this should be amended to pass the proper OUT_HOST_EXECUTABLE, being careful that it points to the host/linux dir, not the current Windows one. Change-Id: Ibb78a517c33d46454828a5932408108dadbee497
* | Merge "Improve error message if manifest has wrong minSdkVersion."Xavier Ducrohet2011-09-161-2/+2
|\ \ | |/ |/|
| * Improve error message if manifest has wrong minSdkVersion.Xavier Ducrohet2011-09-161-2/+2
| | | | | | | | Change-Id: I00ceed502f0a756183198ebbe77da8f2e7fb303d
* | Merge "SDK Manager: make 'list sdk' ids deterministic."Raphael2011-09-1625-149/+465
|\ \
| * | SDK Manager: make 'list sdk' ids deterministic.Raphael2011-09-1625-149/+465
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes 'android list sdk' to output deterministic install IDs. These IDs can then be give to 'android update sdk'. Example of usage: $ android list sdk --extended Refresh Sources: [...] ---------- id: 2 or "android-13" Type: Platform Desc: Android SDK Platform 3.2, revision 1 [...] ---------- id: 41 or "extra-google-usb_driver" Type: Extra Desc: USB Driver for Windows, revision 4 $ android update sdk --no-ui --filter android-13,extra-google-usb_driver => This installs the platform API 13 and the USB Driver. SDK Bug: 19504 Change-Id: I3109c90371d292df4e9cf845208bf8efe774233f
* | | Merge "Update year in copyright notices to 2011."Siva Velusamy2011-09-166-6/+6
|\ \ \ | |_|/ |/| |
| * | Update year in copyright notices to 2011.Siva Velusamy2011-09-166-6/+6
| |/ | | | | | | Change-Id: Ibe1042437e4f320a034be176b0b8efc7d205f79b