aboutsummaryrefslogtreecommitdiffstats
path: root/build/tools.atree
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2012-05-25 17:05:55 -0700
committerTor Norbye <tnorbye@google.com>2012-06-04 16:57:34 -0700
commit56afaff9c34a60c0e850324938d101a0509f8a38 (patch)
tree8a945bf07d4cb162d2c1b0c1d13989ccaa55da41 /build/tools.atree
parent6de0364094c5780cf39f4805ac507374c382da2f (diff)
downloadsdk-56afaff9c34a60c0e850324938d101a0509f8a38.zip
sdk-56afaff9c34a60c0e850324938d101a0509f8a38.tar.gz
sdk-56afaff9c34a60c0e850324938d101a0509f8a38.tar.bz2
Allow project templates to be bundled separately
This changeset moves the various FreeMarker templates out of the ADT plugin and over into the tools install area. The code to instantiate templates is simplified a bit now that it no longer needs to both handle files on disk and files read out of the .jar. There's a new first page to the various template wizards which is shown if the tools are not up to date (specifically, if the $SDK/tools/templates/ directory does not exist). This page explains that the tools have to be updated, and the Next button is disabled until they are up to date. This CL also contains some other tweaks suggested by Roman to the activity-to-layout name mapping and misc code changes. Change-Id: I3bc65f54a6b79bbeedfb917a9d34ec0d312f3526
Diffstat (limited to 'build/tools.atree')
-rw-r--r--build/tools.atree7
1 files changed, 7 insertions, 0 deletions
diff --git a/build/tools.atree b/build/tools.atree
index 16fdaf5..d5d6c08 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -146,6 +146,13 @@ prebuilts/tools/common/proguard/proguard4.7/bin/proguardgui.sh tools/proguard/bi
prebuilts/tools/common/proguard/proguard4.7/bin/retrace.sh tools/proguard/bin/retrace.sh
prebuilts/tools/common/proguard/proguard4.7/src/proguard/ant/task.properties tools/proguard/ant/task.properties
+# Templates
+sdk/templates/projects/NewAndroidApplication tools/templates/projects/NewAndroidApplication
+sdk/templates/activities/BlankActivity tools/templates/activities/BlankActivity
+sdk/templates/activities/MasterDetailFlow tools/templates/activities/MasterDetailFlow
+sdk/templates/other/CustomView tools/templates/other/CustomView
+sdk/templates/resources tools/templates/resources
+
# SDK Controller
sdk/apps/SdkController tools/apps/SdkController