aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set the permission of the emma file before downloading it.Xavier Ducrohet2012-10-233-4/+32
| | | | | | Also fix the build file of the a couple of test projects. Change-Id: I5e75f9c4ac397350d7b54e660782d38a2e3de5ad
* Merge "AVD Manager: display and select newly created AVD."Raphael Moll2012-10-224-12/+62
|\
| * AVD Manager: display and select newly created AVD.Raphael Moll2012-10-224-12/+62
|/ | | | | | | | | | When using Device page > Create AVD, this will switch the AVD Manager to the AVD page, refresh the AVD list and select the new AVD. SDK Bug: 38785 Change-Id: I7cff8f434b16d90cc9e46e938631e6b67bb69af7
* Merge "AVD Manager: use device RAM/VM when creating AVD."Raphael Moll2012-10-221-42/+59
|\
| * AVD Manager: use device RAM/VM when creating AVD.Raphael Moll2012-10-221-42/+59
| | | | | | | | | | | | | | | | Also set default target if there's only one in the current SDK. SDK Bug: 38785 Change-Id: I76d92ea4c43f94275f3d4373251a87ec3a6610a1
* | Merge "Don't warn about missing SDK when bundled"Tor Norbye2012-10-222-9/+18
|\ \ | |/ |/|
| * Don't warn about missing SDK when bundledTor Norbye2012-10-222-9/+18
| | | | | | | | Change-Id: I88d76329ab5f3afa4fda338c170a78bef1939165
* | Merge "adtpackage: Include features, not plugins."Siva Velusamy2012-10-223-67/+34
|\ \
| * | adtpackage: Include features, not plugins.Siva Velusamy2012-10-223-67/+34
| | | | | | | | | | | | | | | | | | | | | This should maintain compatibility with upgrading features provided by ADT plugins. Change-Id: I9a711fd0a9239cfeea421919a2789c82a93899da
* | | Merge "adtpackage: Update 16 and 32 bit icons"Siva Velusamy2012-10-224-4/+1
|\| |
| * | adtpackage: Update 16 and 32 bit iconsSiva Velusamy2012-10-224-4/+1
| | | | | | | | | | | | Change-Id: I521d25a68cd80444bc58f08c4b3939501197517d
* | | Merge "Update test app with new project files."Xavier Ducrohet2012-10-223-53/+61
|\ \ \ | |_|/ |/| |
| * | Update test app with new project files.Xavier Ducrohet2012-10-223-53/+61
| | | | | | | | | | | | Change-Id: I3e59f7880afce36c3ee1195e0927d43208c5c4e1
* | | Merge "SDK Manager: fix SWTMenuBar crash on MacOS X Mountain Lion."Raphaël Moll2012-10-224-56/+233
|\ \ \
| * | | SDK Manager: fix SWTMenuBar crash on MacOS X Mountain Lion.Raphaël Moll2012-10-224-56/+233
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug happens when the SDK Manager is open using the embedded class from within Eclipse 4.2 -- the SWT used is then the newer 3.7 which doesn't have the same cocoa interface for menus. The fix is threefold: - If the cocoa enhancer fails, revert to the generic one. This doesn't quite help here since the crash is actually when the native handler is invoked but the setup is fine. - Implement a new enhancer on top of the newer SWT 3.7 APIs that lets us access the About and Preference menus on Mac. That was the whole point of the enhancer workaround since SWT 3.5 an 3.6 don't have access to these menus directly. This new enhancer is used if SWT version 3700+ is used on Mac. - Finally the crash only happens when using the embedded version of the SDK Manager within ADT. When possible this uses the forked standalone version. It will still revert to the embedded one if ADT is started without any tools. The new enhancer for 3.7 on Mac is sub-optimal: since it *adds* a listener to the about/preference Mac menus, that means when it is invoked from within Eclipse these menus will generate 2 events, e.g. bringing both the Eclipse preferences and then the SDK Manager preferences. To support this case properly, we should detect this runs from within Eclipse, not change the about menu and instead integrate the sdk manager pref as a panel in eclipse's prefs. A cheaper workaround is to revert to the default generic enhancer that will create an options menu. Maybe for a later CL. SDK Bug: 38640 Change-Id: Ib1588e401616548a5dc9eb216d3c35b579d3950b
* | | Merge "Only format Android projects with our formatter"Tor Norbye2012-10-221-2/+65
|\ \ \
| * | | Only format Android projects with our formatterTor Norbye2012-10-221-2/+65
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When formatting, peek at the model base location, if known, and if a corresponding file is found which isn't in an Android project, use the builtin Eclipse formatter instead. This should reduce the impact of the Android XML editor registering itself for the xml content type and affecting unrelated projects, at least in terms of formatting (which is more severe than say additional completion options or extra go to declaration targets.) See issue 38747: Android Tools XML formatter with pom.xml Change-Id: Ifa0e8527b7020c2ca4f477d6e0be6397d2dbdeff
* | | Merge "Automatically pick the best render target"Tor Norbye2012-10-223-22/+89
|\ \ \
| * | | Automatically pick the best render targetTor Norbye2012-10-223-22/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds a new option, on by default, which causes the layout editor to always pick the best rendering target. The best rendering target is typically the most recent one. This option can be toggled in the rendering target drop down menu (but it applies globally), and choosing a specific rendering target turns it off. Change-Id: I53e48a38741f364f2b68525a4898aca69b1ae7b1
* | | | Merge "38700: wrong reporting of <requestFocus /> as missing size"Tor Norbye2012-10-222-8/+15
|\ \ \ \
| * | | | 38700: wrong reporting of <requestFocus /> as missing sizeTor Norbye2012-10-192-8/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I93154fbe3c0d86b6767ef2283ecbc5038163c604
* | | | | Merge "38748: lint doesn't recognise inputtype in style"Tor Norbye2012-10-222-0/+18
|\ \ \ \ \
| * | | | | 38748: lint doesn't recognise inputtype in styleTor Norbye2012-10-222-0/+18
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: Ia00b9d6de3feb1b3dc99b8293c456e5b26e1b860
* | | | | Merge "Fix handling of @SuppressLint on fields"Tor Norbye2012-10-2217-34/+157
|\ \ \ \ \
| * | | | | Fix handling of @SuppressLint on fieldsTor Norbye2012-10-1817-34/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you have a field initialization like this: private int foo = new ForbiddenClass(); the actual code to perform the initialization lives in a method named <init> (or for a static field, <clinit>). If you tried to suppress lint errors here by adding an annotation on the field, it would not be found by lint, since lint looks at method level annotations and it's sitting on the field node instead. To fix this, the suppress check needs to identify the field scenario, and in that case (when checking whether an error is suppressed) look up the field in the class and check annotations there. There was a second bug: The lint check which looks for invalid suppress annotation sites (since they're not allowed on local variables for class based lint checks) incorrectly concluded that these types of initializations were local variables rather than field initializations. This fixes issue 38626: ADT: Misleading lint rule: SimpleDateFormat Change-Id: I254f3fb5a6132d6cbe39bd425ffe6d67ed7b84ed
* | | | | | Merge "Multi-configuration editing bug fixes"Tor Norbye2012-10-2222-548/+1302
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Multi-configuration editing bug fixesTor Norbye2012-10-2222-548/+1302
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset fixes a number of bugs with multi configuration editing; especially around configuration switching and inheritance, as well as some memory improvements. It also synchronizes values between layout variations. If you for example have layout-land/foo.xml and layout-port/foo.xml and you change the Theme to Theme.Holo or the device to Galaxy Nexus, the configurations for both files will be updated (whether or not the files are open), and provided of course the layout folder doesn't contradict it; layout-xlarge/foo.xml would be unaffected by the above edit since Galaxy Nexus doesn't match the layout-xlarge folder. Change-Id: I5c01555aad8339f68788d8aed1f707d30993ae1b
* | | | Merge "Fix manufacturer by Nexus devices."Xavier Ducrohet2012-10-191-4/+4
|\ \ \ \
| * | | | Fix manufacturer by Nexus devices.Xavier Ducrohet2012-10-191-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I30db5f7fb88f3e422a507a0d49152c23f0dff4ff
* | | | | Merge "Fix incorrect assertion"Xavier Ducrohet2012-10-191-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix incorrect assertionTor Norbye2012-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id110d90b173d052b952f90622bcbff64f5bedbe5
* | | | | Merge "Fix UTF-8 encoding in some tests"Xavier Ducrohet2012-10-192-4/+5
|\| | | |
| * | | | Fix UTF-8 encoding in some testsTor Norbye2012-10-192-4/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia815a807db6d9b65f7852a4b8ae614fc69f510fe
* | | | | Merge "Update maven artifacts and add lint."Xavier Ducrohet2012-10-1914-40/+310
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update maven artifacts and add lint.Xavier Ducrohet2012-10-1914-40/+310
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the groupId of most artifacts to be more reflective of their sub-projects status in the SDK tools. Added lint artifacts. Change-Id: I900a165647a9b7d3c55b473f63c4ca4469762d7b
* | | | Merge "adtpackage: Add about section for adtpackage feature"Siva Velusamy2012-10-193-1/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | adtpackage: Add about section for adtpackage featureSiva Velusamy2012-10-193-1/+14
|/ / / | | | | | | | | | Change-Id: I7a2d51324e97ceb6fb038b10bc382fa8da826d91
* | | Merge "adtpackage: Update with new assets"Siva Velusamy2012-10-1910-18/+27
|\ \ \
| * | | adtpackage: Update with new assetsSiva Velusamy2012-10-1910-18/+27
| | | | | | | | | | | | | | | | Change-Id: Ic44f7e1fdc09d278ed3d6163a3ee6022b6a9dc69
* | | | Merge "Set build id for ADT IDE."Raphael Moll2012-10-191-0/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Set build id for ADT IDE.Raphael Moll2012-10-191-0/+5
|/ / / | | | | | | | | | Change-Id: I9191826e7c764032b2c0075108b49f715fff3181
* | | Merge "Move HardwareConfigHelper to sdk_common."Xavier Ducrohet2012-10-182-3/+4
|\ \ \ | |_|/ |/| |
| * | Move HardwareConfigHelper to sdk_common.Xavier Ducrohet2012-10-182-3/+4
|/ / | | | | | | Change-Id: Iae39e23f6c72f5a2e1444c39da1eb1a78894e9f4
* | Merge "Update Layoutlib_api to use a class for h/w config."Xavier Ducrohet2012-10-1718-304/+372
|\ \
| * | Update Layoutlib_api to use a class for h/w config.Xavier Ducrohet2012-10-1718-304/+372
| |/ | | | | | | Change-Id: Iead02d468590407ec274357f1a1c57ed8d5cc24c
* | Merge "ADT 21 rc9 depends on Tools 21 rc9."Raphael Moll2012-10-171-1/+1
|\ \
| * | ADT 21 rc9 depends on Tools 21 rc9.Raphael Moll2012-10-171-1/+1
|/ / | | | | | | Change-Id: I069f9df1c50cf16329934046ed1bc5bbd04d2533
* | Merge "32849: Fix CRLF line ending handling in the partial formatter"Tor Norbye2012-10-1713-12/+646
|\ \
| * | 32849: Fix CRLF line ending handling in the partial formatterTor Norbye2012-10-1713-12/+646
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the handling of \r characters in the code which applies formatting deltas into existing documents. It could end up inserting the formatted portion in the middle of a \r\n pair, which made Eclipse extremely confused (https://bugs.eclipse.org/bugs/show_bug.cgi?id=375421) This fixes 32849: Eclipse android adt xml editing artifacting (unsynced) lines of text when changes are made in the graphical interface It also adds a lint check to identify *existing* files that already have these mangled line endings, along with a quickfix to make the correction. Change-Id: I1e7024f2786e4cb0233c2c6b98c3d3f942703ea0
* | Merge "Fix generic devices."Xavier Ducrohet2012-10-171-2/+2
|\ \ | |/ |/|