aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
Commit message (Collapse)AuthorAgeFilesLines
* Update ADT plugin with lint API changeTor Norbye2015-04-091-1/+6
| | | | Change-Id: Ie649d5fcea29cfec0cec64833664353ec61ad408
* Track tools/base API change in Eclipse pluginTor Norbye2015-04-061-0/+13
| | | | Change-Id: Id1f6a80f8465ad97d392cda6083f374490aa8099
* Update easymock version to 3.3Siva Velusamy2015-04-061-1/+1
| | | | Change-Id: Ic34fe3940f5514b19a52fc3e5046cce8cd6ec3ce
* Move to the new LayoutlibCallback.Deepanshu Gupta2015-04-021-4/+10
| | | | | | | | | LegacyCallback will be removed shortly. The change moves to the new LayoutlibCallback. Also implement the newly added supports() method. Change-Id: If0871d56a83818d29112f07f29b3b77b401b4fb9
* Merge "pixel perfect: Disable controls" into studio-1.1-devTor Norbye2015-02-051-3/+5
|\ | | | | | | | | | | | | automerge: b234933 * commit 'b234933dc60c7c85db36156b74b6e2c49b2ee9a9': pixel perfect: Disable controls
| * pixel perfect: Disable controlsSiva Velusamy2015-02-031-3/+5
| | | | | | | | | | | | Fix for https://code.google.com/p/android/issues/detail?id=69199 Change-Id: Id90b589dafc02157196e16bbf65beebeb3d57178
| * Add AssetRepository to render params.Deepanshu Gupta2015-01-281-0/+4
| | | | | | | | | | | | | | | | By adding the asset repository, we ensure that LayoutLib knows that the IDE doesn't support assets and doesn't log an error. Change-Id: Ie4dd8fecbb358c7977ab0568832d37de81ac256d (cherry picked from commit 4368aeabecbe6356940477ec4fdfaa8d5017e10c)
* | Update Eclipse plugin to handle new LocaleQualifier APITor Norbye2015-02-0416-452/+439
| | | | | | | | Change-Id: I1d5eaec7e6f61a21b07cf790166d9b6ea8f041db
* | Merge "Remove stale scripts" into studio-1.2-devSiva Velusamy2015-02-038-1085/+0
|\ \
| * | Remove stale scriptsSiva Velusamy2015-02-038-1085/+0
| |/ | | | | | | Change-Id: I85fdf33a69cb9adeb1a59d691f3ef92b3bfcd455
* | Merge "Add AssetRepository to render params." into studio-1.2-devDeepanshu Gupta2015-01-281-0/+4
|\ \ | |/ |/|
| * Add AssetRepository to render params.Deepanshu Gupta2015-01-281-0/+4
| | | | | | | | | | | | | | By adding the asset repository, we ensure that LayoutLib knows that the IDE doesn't support assets and doesn't log an error. Change-Id: Ie4dd8fecbb358c7977ab0568832d37de81ac256d
* | Track LocaleManager API changesTor Norbye2015-01-272-3/+4
|/ | | | Change-Id: Ibc5a6e7b0681848240376b165efa2cf49f0beb37
* Update adt plugin's manifest to use lombok 0.2.3Siva Velusamy2015-01-141-1/+1
| | | | Change-Id: I87b5b3098758c33f8101760f6ccdbcd4ed016a2a
* Use Lombok 0.2.3 for ADT pluginTor Norbye2015-01-072-2/+2
| | | | Change-Id: I582a8900a2ca86a9cbfaccdb0dba2526b0bb2050
* Update ADT with ASM 5.0.3Tor Norbye2014-12-196-16/+16
| | | | Change-Id: I03d846ce1bf9210ca8c35da9cf11a395fd950251
* Minor improvements to systrace options dialogSiva Velusamy2014-12-161-24/+57
| | | | | | | | | | This CL includes the following minor tweaks the systrace options dialog: - shows the default values to be used in a couple of text boxes - splits the list of tags into two sections: a commonly used set and a list of advanced tags Change-Id: I19b3033c099c181c2d801da262a899f6586da9fd
* Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-devTor Norbye2014-12-164-169/+3
|\ | | | | | | | | | | | | automerge: 1d5ab02 * commit '1d5ab02a49d3a481b844ce8f75ae3e9aa6ac8eb9': Revert "82393: Fix template instantiation in ADT"
| * Revert "82393: Fix template instantiation in ADT"Tor Norbye2014-12-154-169/+3
| | | | | | | | | | | | | | | | | | | | | | This reverts commit d7d481fa5e19353d1636f4df8b9bf875539bbc81. Rather than attempting to teach ADT to understand the new template formats, just continue to use the pre-24 templates instead (see https://android-review.googlesource.com/#/c/119386/ ) (cherry picked from commit c55e62658aaa2900759dd32e8f3e3b04b691d696) Change-Id: If7f6a4ae219581871cd979ae1aeeaf0d49ab7cce
* | Merge "82393: Fix template instantiation in ADT" into studio-1.0-devTor Norbye2014-12-164-3/+169
|\ \ | |/ | | | | | | | | | | automerge: 2d9dc8d * commit '2d9dc8d03d3565b0b74da540ba5b4457eff09584': 82393: Fix template instantiation in ADT
| * 82393: Fix template instantiation in ADTTor Norbye2014-12-114-3/+169
| | | | | | | | | | | | | | | | | | First, implement a couple of new freemarker methods required by the templates. Second, switch the manifest merger over to the new Manifest merger. Change-Id: I26200d0a861ebddd4c4c92ebbba418ccb88fcb20 (cherry picked from commit d7d481fa5e19353d1636f4df8b9bf875539bbc81)
| * Update ADT to version 24.0.1Tor Norbye2014-12-1053-77/+77
| | | | | | | | | | Change-Id: I0421e319ec529feb0b6bcbfc3fe41350295afe5d (cherry picked from commit a491fbd8a9d553ece86677700ba7e30a41d79118)
* | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.1-devTor Norbye2014-12-1554-78/+78
|\ \
| * | Update ADT & SDK Tools to 24.0.2Tor Norbye2014-12-1554-78/+78
| | | | | | | | | | | | Change-Id: Idf12b9f222ad862bf5b8f0cc51b602eaf0924054
* | | Revert "82393: Fix template instantiation in ADT"Tor Norbye2014-12-154-169/+3
|/ / | | | | | | | | | | | | | | This reverts commit d7d481fa5e19353d1636f4df8b9bf875539bbc81. Rather than attempting to teach ADT to understand the new template formats, just continue to use the pre-24 templates instead (see https://android-review.googlesource.com/#/c/119386/ )
* | Fix Eclipse build.Xavier Ducrohet2014-12-122-0/+2
| | | | | | | | Change-Id: I54e45e8d9aafccea9d1177b5c5c259ca059b5677
* | 82393: Fix template instantiation in ADTTor Norbye2014-12-114-3/+169
| | | | | | | | | | | | | | | | First, implement a couple of new freemarker methods required by the templates. Second, switch the manifest merger over to the new Manifest merger. Change-Id: I26200d0a861ebddd4c4c92ebbba418ccb88fcb20
* | Update ADT to version 24.0.1Tor Norbye2014-12-1053-77/+77
|/ | | | Change-Id: I0421e319ec529feb0b6bcbfc3fe41350295afe5d
* Update ADT version to 24.0.0.Tor Norbye2014-12-0353-77/+77
| | | | Change-Id: I35126be74bfbbafb3c7acb047b8dc0076bd3b669
* 80481: Update Gradle Export from Eclipse to handle 1.0Tor Norbye2014-12-023-7/+8
| | | | Change-Id: Ib62817d9c906adf8d893773027a34590a2bf56ed
* Update ADT version to 23.0.6Tor Norbye2014-11-2653-77/+77
| | | | Change-Id: I23d62d1778b798711d1ad666db3bead193f90ef2
* 72760: Lint errors prevent exporting of applicationTor Norbye2014-11-267-11/+78
| | | | Change-Id: I710982520f2ac40674dca7f63760f525051342a2
* Do not include META-INF/maven folder in generated artifactSiva Velusamy2014-10-291-0/+20
| | | | Change-Id: Ib085f8082e6b3859c0cc4bcb881cceb1485c81bc
* Update Guava 15.0 -> 17.0Siva Velusamy2014-10-275-13/+30
| | | | Change-Id: If666053e03e67b49c3337129be869ebe996ec58d
* Adjust ADT to new ITestRunListener changes.Brett Chabot2014-09-232-10/+33
| | | | | | | | | | This fixes ADT so it compiles against the ITestRunListener changes made to support new JUnit4 states. It does not change ADT to truly support junit4: eg use the junit4.runtime plugin, pass assumptionfailure and ignored test states back to eclipse UI, etc Bug: 16684768 Change-Id: I16ee8d6d863a17fe061446f4ced6ce0ec3780600
* Track lint API changes in the Eclipse lint integrationTor Norbye2014-09-1510-26/+34
| | | | Change-Id: If9c6843f0b9231a2b629e61ab7b8c3a401485f1f
* Update ADT version to 23.0.4Raphael Moll2014-09-0353-77/+77
| | | | Change-Id: I77448d2769d2a15b64987ae7d9e2cb887aef3bc2
* Match language-specific flags before default locale country matchesTor Norbye2014-08-291-11/+12
| | | | | | Fixes issue 75173. Change-Id: Ic825a50664e2c6bae47499482ead8f60a3758787
* Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-181-1/+1
|\ | | | | | | | | | | | | automerge: 1d55d41 * commit '1d55d413646dfc6f4d95e4f74a5bfdd7ed1c23cd': gltrace: Increase launch timeout
| * gltrace: Increase launch timeoutSiva Velusamy2014-08-181-1/+1
| | | | | | | | | | | | b/17106700 Change-Id: I584d546502535d5390ca7b24029205895ce97550
* | Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
|\ \ | |/ | | | | | | | | | | automerge: b0e06f6 * commit 'b0e06f6fcfc02a35f086367ccef8294b0f9376e3': Change Device List to Device Collection.
| * Change Device List to Device Collection.Deepanshu Gupta2014-08-158-21/+27
| | | | | | | | | | | | | | sdklib now stores devices as LinkedHashSet. Change the List to a Collection so that it's agnostic of the underlying representation. Change-Id: I14a20d7fff6495c0d61c6f250a92cfe9210b50d9
* | Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
|\ \ | |/ | | | | | | | | | | automerge: 4d05f33 * commit '4d05f33f9ac64d5570e0ae841bcb33101a8f1ba3': gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS
| * gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBSSiva Velusamy2014-08-141-2/+2
| | | | | | | | | | | | | | This is a short term workaround until the state information can be updated properly with actual values from the device. Change-Id: I4387613f320deb9a88d3810a81910f348c9839f6
* | Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-0/+188
|\ \ | |/ | | | | | | | | | | automerge: f68260f * commit 'f68260f91fe2eee6687d6108eaff2d8f9319937d': monitor: Move from sdk/ to sdk/eclipse
| * monitor: Move from sdk/ to sdk/eclipseSiva Velusamy2014-07-234-0/+188
| | | | | | | | | | | | | | | | | | | | The monitor Gradle build script assumed that the version of monitor matches the tools. However, it really matches the version of the Eclipse plugins. This CL moves monitor into the eclipse folder so that the version updater script handles the version encoded inside monitor's build script. Change-Id: I31e70bfc705af00fbaacde417cf505740701038b
* | Merge "Include JDT as a required dependency" into idea133Siva Velusamy2014-07-221-0/+1
|\ \ | |/ | | | | | | | | | | automerge: b282ba8 * commit 'b282ba8d3d00ea5cc9df539492f06ced394463f9': Include JDT as a required dependency
| * Include JDT as a required dependencySiva Velusamy2014-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | JDT itself was included, but without this explicit requirement, the annotations processing (apt) plugins (org.eclipse.jdt.adt.*) weren't being installed. https://code.google.com/p/android/issues/detail?id=73798 Change-Id: Id097200c044cb840ea961bd51878a6b21a3026ca
* | Merge "Add NDK plugin to ADT package feature" into idea133Siva Velusamy2014-07-221-0/+1
|\ \ | |/ | | | | | | | | | | automerge: d4ce9eb * commit 'd4ce9eb0eddd3faf21dbcc66c1764113f242d66b': Add NDK plugin to ADT package feature
| * Add NDK plugin to ADT package featureSiva Velusamy2014-07-211-0/+1
| | | | | | | | Change-Id: I9fe8bf7cc4e5a744d7e20357e48615fec38a5b19