| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: Ie649d5fcea29cfec0cec64833664353ec61ad408
|
|
|
|
| |
Change-Id: Id1f6a80f8465ad97d392cda6083f374490aa8099
|
|
|
|
|
|
|
|
|
| |
LegacyCallback will be removed shortly. The change moves to the new
LayoutlibCallback.
Also implement the newly added supports() method.
Change-Id: If0871d56a83818d29112f07f29b3b77b401b4fb9
|
|
|
|
| |
Change-Id: I1d5eaec7e6f61a21b07cf790166d9b6ea8f041db
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
| |
Change-Id: Ibc5a6e7b0681848240376b165efa2cf49f0beb37
|
|
|
|
| |
Change-Id: I03d846ce1bf9210ca8c35da9cf11a395fd950251
|
|\
| |
| |
| |
| |
| |
| | |
automerge: 1d5ab02
* commit '1d5ab02a49d3a481b844ce8f75ae3e9aa6ac8eb9':
Revert "82393: Fix template instantiation in ADT"
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| | |
automerge: 2d9dc8d
* commit '2d9dc8d03d3565b0b74da540ba5b4457eff09584':
82393: Fix template instantiation in ADT
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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)
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Change-Id: Idf12b9f222ad862bf5b8f0cc51b602eaf0924054
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
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/ )
|
|/
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: Ib62817d9c906adf8d893773027a34590a2bf56ed
|
|
|
|
| |
Change-Id: I710982520f2ac40674dca7f63760f525051342a2
|
|
|
|
| |
Change-Id: If666053e03e67b49c3337129be869ebe996ec58d
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: If9c6843f0b9231a2b629e61ab7b8c3a401485f1f
|
|
|
|
|
|
| |
Fixes issue 75173.
Change-Id: Ic825a50664e2c6bae47499482ead8f60a3758787
|
|
|
|
|
|
|
| |
sdklib now stores devices as LinkedHashSet. Change the List to a
Collection so that it's agnostic of the underlying representation.
Change-Id: I14a20d7fff6495c0d61c6f250a92cfe9210b50d9
|
|\ |
|
| |
| |
| |
| | |
Change-Id: I000bc2ef58c189b60148bd242d914b6cdae7df97
|
|\ \
| |/
|/| |
|
| |
| |
| |
| | |
Change-Id: I332c2ca02644a44dd310bcd0ac1eff62a4b8fb14
|
| |
| |
| |
| |
| |
| |
| | |
Add support for menus in the Layout Editor through tools attributes like
tools:menu and tools:actionBarNavMode.
Change-Id: If437d5727579670e65a21efd4016bdc53fd172bf
|
|/
|
|
| |
Change-Id: Iaf29f9afd0991b5886a00247f8a699a14ccd1b7a
|
|
|
|
|
|
|
| |
Fix imports in ADT.
Related to tools/base change Iea81ed343f41112eaa9dbb94a97f8f01930bbb0b.
Change-Id: I87c57ceb175ef7cda09d44f014d587eb046ab90e
|
|
|
|
|
|
|
| |
This CL adds a few checks to guard against NPEs that could
occur if the manifest parsing failed (e.g. due to a missing manifest)
Change-Id: I82a9b3b1fa3d651c13125798f70b61e5492e0838
|
|
|
|
|
|
|
| |
This change updates template handling in ADT to handle new tags including
formfactor and category.
Change-Id: Ia9bd6bdcfaf40061835381f8d3c6f8d67274d694
|
|
|
|
|
|
|
|
| |
These files are now in plat-tools. also make tools 23
depend on that new plat-tools and adt/tools 23 require each
other.
Change-Id: Icdcf3b9f7f0787d385a930f7ebecfcf7049eb3e0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We tried the approach of replacing bundled jars with OSGI
jars. However, this eventually ended up resulting in
ClassCircularityError thrown at runtime when running on
Java 7. As far as we could diagnose, the issue seems to
be that:
- LayoutLibrary attempts to load layoutlib.jar (which is
a regular jar present inside the android sdk data folder).
- The class loader passed to layoutlib is the LayoutLibrary's
class loader.
- The classes inside the layout library then attempt to
load classes from a different OSGI jar (layoutlib-api)
- At this time, we receive a ClassCircularityError
Most of our other jars depend on layoutlib-api, so it is
not possible to just bundle layoutlib-api. So for now, we
are back to bundling jars.
Change-Id: Ic8c838a1a7e90e1bc6b8c5251341b1ded46053ba
|
|
|
|
| |
Change-Id: Ib685bfa749b63f9e04f9990459ad47b2d812f692
|
|
|
|
| |
Change-Id: I58365108cd065a5ef710514f834741202af08666
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently ADT checks that a specified instrumentation test runner
is actually a subclass of android.test.InstrumentationTestRunner.
This doesn't work for Google Instrumentation Test Runner since it
is a subclass of Google Instrumentation.
This CL relaxes the requirement that a runner has to implement
InstrumentationTestRunner: now it only has to implement
Instrumentation.
Fixes https://code.google.com/p/android/issues/detail?id=68575
Change-Id: I4500016941137bb98b90b5407c3e17d705ec2af9
|
|
|
|
|
|
| |
ADT 22.61 requires Tools 22.6.2 and vice versa.
Change-Id: Id80a0bbdea2c6aece86e9542a2cf8174b0537c0e
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
SDK Bug: b.android.com/67084
Reason: we recently switched SDK Manager location to a File
instead of string. ADT tries to automatically refresh the
SDK when it has changed or its path has changed and the
comparison between a File-to-path and the original path
string from the pref now differed by an ending /.
Also renames the legacy method to avoid confusion.
Change-Id: Ie4349075528fb552efe10cac4b4462b4bfd3a13f
|
| |
| |
| |
| | |
Change-Id: I79ef603244bd2373fae8b57d6316e415e821a933
|
|/
|
|
| |
Change-Id: I3e6f2c4228da78b48df8d138df20e0b0126c4926
|
|
|
|
|
|
|
|
| |
Parse the Manifest to get the correct Title and Icon for the action bar.
TODO: Implement the ActionBarCallback to return the correct values for
ActionBar Menus.
Change-Id: I1b82c38bfcebbb2582b82c8bca4ad19da17c5ef4
|
|\ |
|
| |
| |
| |
| | |
Change-Id: Ibc66e2b85ca14acc6c6b2be25eec046b76a7bda4
|
|/
|
|
| |
Change-Id: I4ca7e5c5ab3d44cd2ccfc5ef26d0382c633d308a
|
|
|
|
| |
Change-Id: I11bade1debfec42f790534cc7a699686b1e8db1d
|
|
|
|
| |
Change-Id: I1908912102ca597fbe2bfa34b343e30f8c7a19d2
|
|\
| |
| |
| | |
features" into idea133
|
| |
| |
| |
| | |
Change-Id: I6658254c22c866fce93e0ffc0c5a4d694b79e57e
|