Modified templates for Gradle projects

Modifies the existing templates to output Gradle build files with a
new multi-level directory structure. The templates continue to work
the old way that Eclipse expects, and the new behavior is only enabled
if the "isGradle" global is set to "true".

Files to configure the Gradle wrapper are placed in the SDK at
tools/templates/gradle/wrapper.

This CL changes all file copies and merges to go to fully-qualified
directories set up via global variables. Things go to the old
locations for non-Gradle builds based on how the globals are set up,
but Gradle builds can override output directory variables to reflect
the new directory structure.

This CL also adds NewAndroidLibrary and NewJavaLibrary project
templates, which will be used in the future. The current
NewAndroidApplication template also can output a library, which is
redundant and confusing; this will likely be fixed somehow in the
future.

Change-Id: Ieb830bdfba1797d87a218326ebd37c99d254758e

11 files changed, 79 insertions, 42 deletions

diff --git a/templates/activities/BlankActivity/globals.xml.ftl b/templates/activities/BlankActivity/globals.xml.ftl
index 6220005..11aabd7 100644
--- a/templates/activities/BlankActivity/globals.xml.ftl
+++ b/templates/activities/BlankActivity/globals.xml.ftl
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <globals>
+    <global id="projectOut" value="." />
+    <global id="manifestOut" value="." />
     <global id="srcOut" value="src/${slashedPackageName(packageName)}" />
+    <global id="resOut" value="res" />
     <global id="menuName" value="${classToResource(activityClass)}" />
 </globals>
diff --git a/templates/activities/BlankActivity/recipe.xml.ftl b/templates/activities/BlankActivity/recipe.xml.ftl
index 78bd8b2..148b09d 100644
--- a/templates/activities/BlankActivity/recipe.xml.ftl
+++ b/templates/activities/BlankActivity/recipe.xml.ftl
@@ -1,32 +1,37 @@
 <?xml version="1.0"?>
 <recipe>
-    <merge from="AndroidManifest.xml.ftl" />
+    <merge from="AndroidManifest.xml.ftl"
+             to="${manifestOut}/AndroidManifest.xml" />
 
     <instantiate from="res/menu/main.xml.ftl"
-            to="res/menu/${menuName}.xml" />
+            to="${resOut}/menu/${menuName}.xml" />
 
-    <merge from="res/values/strings.xml.ftl" />
+    <merge from="res/values/strings.xml.ftl"
+             to="${resOut}/values/strings.xml" />
 
-    <merge from="res/values/dimens.xml" />
-    <merge from="res/values-sw600dp/dimens.xml" />
-    <merge from="res/values-sw720dp-land/dimens.xml" />
+    <merge from="res/values/dimens.xml"
+             to="${resOut}/values/dimens.xml" />
+    <merge from="res/values-sw600dp/dimens.xml"
+             to="${resOut}/values-sw600dp/dimens.xml" />
+    <merge from="res/values-sw720dp-land/dimens.xml"
+             to="${resOut}/values-sw720dp-land/dimens.xml" />
 
     <!-- Decide what kind of layout to add (viewpager or not) -->
     <#if navType?contains("pager")>
         <instantiate from="res/layout/activity_pager.xml.ftl"
-                       to="res/layout/${layoutName}.xml" />
+                       to="${resOut}/layout/${layoutName}.xml" />
         <instantiate from="res/layout/fragment_dummy.xml.ftl"
-                       to="res/layout/fragment_${classToResource(activityClass)}_dummy.xml" />
+                       to="${resOut}/layout/fragment_${classToResource(activityClass)}_dummy.xml" />
 
     <#elseif navType == "tabs" || navType == "dropdown">
         <instantiate from="res/layout/activity_fragment_container.xml"
-                     to="res/layout/${layoutName}.xml" />
+                       to="${resOut}/layout/${layoutName}.xml" />
         <instantiate from="res/layout/fragment_dummy.xml.ftl"
-                       to="res/layout/fragment_${classToResource(activityClass)}_dummy.xml" />
+                       to="${resOut}/layout/fragment_${classToResource(activityClass)}_dummy.xml" />
 
     <#else>
         <instantiate from="res/layout/activity_simple.xml.ftl"
-                     to="res/layout/${layoutName}.xml" />
+                       to="${resOut}/layout/${layoutName}.xml" />
     </#if>
 
     <!-- Decide which activity code to add -->
@@ -48,5 +53,5 @@
 
     </#if>
 
-    <open file="res/layout/${layoutName}.xml" />
+    <open file="${resOut}/layout/${layoutName}.xml" />
 </recipe>
diff --git a/templates/activities/FullscreenActivity/globals.xml.ftl b/templates/activities/FullscreenActivity/globals.xml.ftl
index a416d3a..6d73e17 100644
--- a/templates/activities/FullscreenActivity/globals.xml.ftl
+++ b/templates/activities/FullscreenActivity/globals.xml.ftl
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <globals>
+    <global id="projectOut" value="." />
+    <global id="manifestOut" value="." />
     <global id="srcOut" value="src/${slashedPackageName(packageName)}" />
+    <global id="resOut" value="res" />
     <global id="simpleName" value="${activityToLayout(activityClass)}" />
 </globals>
diff --git a/templates/activities/FullscreenActivity/recipe.xml.ftl b/templates/activities/FullscreenActivity/recipe.xml.ftl
index 1e41e5f..b3e1f20 100644
--- a/templates/activities/FullscreenActivity/recipe.xml.ftl
+++ b/templates/activities/FullscreenActivity/recipe.xml.ftl
@@ -1,16 +1,21 @@
 <?xml version="1.0"?>
 <recipe>
-    <merge from="AndroidManifest.xml.ftl" />
+    <merge from="AndroidManifest.xml.ftl"
+             to="${manifestOut}/AndroidManifest.xml" />
 
-    <merge from="res/values/attrs.xml" />
-    <merge from="res/values/colors.xml" />
-    <merge from="res/values/styles.xml" />
-    <merge from="res/values-v11/styles.xml" />
+    <merge from="res/values/attrs.xml"
+             to="${resOut}/values/attrs.xml" />
+    <merge from="res/values/colors.xml"
+             to="${resOut}/values/colors.xml" />
+    <merge from="res/values/styles.xml"
+              to="${resOut}/values/styles.xml" />
+    <merge from="res/values-v11/styles.xml"
+             to="${resOut}/values-v11/styles.xml" />
     <instantiate from="res/layout/activity_fullscreen.xml.ftl"
-                   to="res/layout/${layoutName}.xml" />
+                   to="${resOut}/layout/${layoutName}.xml" />
 
     <merge from="res/values/strings.xml.ftl"
-             to="res/values/strings.xml" />
+             to="${resOut}/values/strings.xml" />
 
     <instantiate from="src/app_package/FullscreenActivity.java.ftl"
                    to="${srcOut}/${activityClass}.java" />
@@ -21,5 +26,5 @@
     <instantiate from="src/app_package/util/SystemUiHiderHoneycomb.java.ftl"
                    to="${srcOut}/util/SystemUiHiderHoneycomb.java" />
 
-    <open file="res/layout/${layoutName}.xml" />
+    <open file="${resOut}/layout/${layoutName}.xml" />
 </recipe>
diff --git a/templates/activities/FullscreenActivity/root/res/values/attrs.xml b/templates/activities/FullscreenActivity/root/res/values/attrs.xml
index 0201588..2cf1a1a 100644
--- a/templates/activities/FullscreenActivity/root/res/values/attrs.xml
+++ b/templates/activities/FullscreenActivity/root/res/values/attrs.xml
@@ -9,4 +9,4 @@
         <attr name="buttonBarButtonStyle" format="reference" />
     </declare-styleable>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/templates/activities/LoginActivity/globals.xml.ftl b/templates/activities/LoginActivity/globals.xml.ftl
index 62dfd8d..fbe8985 100644
--- a/templates/activities/LoginActivity/globals.xml.ftl
+++ b/templates/activities/LoginActivity/globals.xml.ftl
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <globals>
+    <global id="projectOut" value="." />
+    <global id="manifestOut" value="." />
     <global id="srcOut" value="src/${slashedPackageName(packageName)}" />
+    <global id="resOut" value="res" />
     <global id="menuName" value="${classToResource(activityClass)}" />
     <global id="simpleName" value="${activityToLayout(activityClass)}" />
 </globals>
diff --git a/templates/activities/LoginActivity/recipe.xml.ftl b/templates/activities/LoginActivity/recipe.xml.ftl
index ece4285..58d823f 100644
--- a/templates/activities/LoginActivity/recipe.xml.ftl
+++ b/templates/activities/LoginActivity/recipe.xml.ftl
@@ -1,19 +1,22 @@
 <?xml version="1.0"?>
 <recipe>
-    <merge from="AndroidManifest.xml.ftl" />
+    <merge from="AndroidManifest.xml.ftl"
+             to="${manifestOut}/AndroidManifest.xml" />
 
-    <merge from="res/values/styles.xml" />
-    <merge from="res/values-large/styles.xml" />
+    <merge from="res/values/styles.xml"
+             to="${resOut}/values/styles.xml" />
+    <merge from="res/values-large/styles.xml"
+             to="${resOut}/values-large/styles.xml" />
     <copy from="res/menu/activity_login.xml"
-            to="res/menu/${menuName}.xml" />
+            to="${resOut}/menu/${menuName}.xml" />
     <instantiate from="res/layout/activity_login.xml.ftl"
-                   to="res/layout/${layoutName}.xml" />
+                   to="${resOut}/layout/${layoutName}.xml" />
 
     <instantiate from="res/values/strings.xml.ftl"
-                   to="res/values/strings_${simpleName}.xml" />
+                   to="${resOut}/values/strings_${simpleName}.xml" />
 
     <instantiate from="src/app_package/LoginActivity.java.ftl"
                    to="${srcOut}/${activityClass}.java" />
 
-    <open file="res/layout/${layoutName}.xml" />
+    <open file="${resOut}/layout/${layoutName}.xml" />
 </recipe>
diff --git a/templates/activities/MasterDetailFlow/globals.xml.ftl b/templates/activities/MasterDetailFlow/globals.xml.ftl
index 952e278..415d60e 100644
--- a/templates/activities/MasterDetailFlow/globals.xml.ftl
+++ b/templates/activities/MasterDetailFlow/globals.xml.ftl
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <globals>
+    <global id="projectOut" value="." />
+    <global id="manifestOut" value="." />
     <global id="srcOut" value="src/${slashedPackageName(packageName)}" />
+    <global id="resOut" value="res" />
     <global id="CollectionName" value="${extractLetters(objectKind)}List" />
     <global id="collection_name" value="${extractLetters(objectKind?lower_case)}_list" />
     <global id="DetailName" value="${extractLetters(objectKind)}Detail" />
diff --git a/templates/activities/MasterDetailFlow/recipe.xml.ftl b/templates/activities/MasterDetailFlow/recipe.xml.ftl
index 8b09c84..c06e517 100644
--- a/templates/activities/MasterDetailFlow/recipe.xml.ftl
+++ b/templates/activities/MasterDetailFlow/recipe.xml.ftl
@@ -1,19 +1,23 @@
 <?xml version="1.0"?>
 <recipe>
-    <merge from="AndroidManifest.xml.ftl" />
+    <merge from="AndroidManifest.xml.ftl"
+             to="${manifestOut}/AndroidManifest.xml" />
 
-    <merge from="res/values-large/refs.xml.ftl" />
-    <merge from="res/values-sw600dp/refs.xml.ftl" />
-    <merge from="res/values/strings.xml.ftl" />
+    <merge from="res/values-large/refs.xml.ftl"
+             to="${resOut}/values-large/refs.xml" />
+    <merge from="res/values-sw600dp/refs.xml.ftl"
+             to="${resOut}/values-sw600dp/refs.xml" />
+    <merge from="res/values/strings.xml.ftl"
+             to="${resOut}/values/strings.xml" />
 
     <instantiate from="res/layout/activity_content_detail.xml.ftl"
-                   to="res/layout/activity_${detail_name}.xml" />
+                   to="${resOut}/layout/activity_${detail_name}.xml" />
     <instantiate from="res/layout/activity_content_list.xml.ftl"
-                   to="res/layout/activity_${collection_name}.xml" />
+                   to="${resOut}/layout/activity_${collection_name}.xml" />
     <instantiate from="res/layout/activity_content_twopane.xml.ftl"
-                   to="res/layout/activity_${extractLetters(objectKind?lower_case)}_twopane.xml" />
+                   to="${resOut}/layout/activity_${extractLetters(objectKind?lower_case)}_twopane.xml" />
     <instantiate from="res/layout/fragment_content_detail.xml.ftl"
-                   to="res/layout/fragment_${detail_name}.xml" />
+                   to="${resOut}/layout/fragment_${detail_name}.xml" />
 
     <instantiate from="src/app_package/ContentDetailActivity.java.ftl"
                    to="${srcOut}/${DetailName}Activity.java" />
diff --git a/templates/activities/SettingsActivity/globals.xml.ftl b/templates/activities/SettingsActivity/globals.xml.ftl
index a416d3a..6d73e17 100644
--- a/templates/activities/SettingsActivity/globals.xml.ftl
+++ b/templates/activities/SettingsActivity/globals.xml.ftl
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <globals>
+    <global id="projectOut" value="." />
+    <global id="manifestOut" value="." />
     <global id="srcOut" value="src/${slashedPackageName(packageName)}" />
+    <global id="resOut" value="res" />
     <global id="simpleName" value="${activityToLayout(activityClass)}" />
 </globals>
diff --git a/templates/activities/SettingsActivity/recipe.xml.ftl b/templates/activities/SettingsActivity/recipe.xml.ftl
index e315963..6f68147 100644
--- a/templates/activities/SettingsActivity/recipe.xml.ftl
+++ b/templates/activities/SettingsActivity/recipe.xml.ftl
@@ -1,14 +1,19 @@
 <?xml version="1.0"?>
 <recipe>
-    <merge from="AndroidManifest.xml.ftl" />
+    <merge from="AndroidManifest.xml.ftl"
+             to="${manifestOut}/AndroidManifest.xml" />
 
-    <copy from="res/xml/pref_data_sync.xml" />
-    <copy from="res/xml/pref_general.xml" />
-    <merge from="res/xml/pref_headers.xml.ftl" />
-    <copy from="res/xml/pref_notification.xml" />
+    <copy from="res/xml/pref_data_sync.xml"
+            to="${resOut}/xml/pref_data_sync.xml" />
+    <copy from="res/xml/pref_general.xml"
+            to="${resOut}/xml/pref_general.xml" />
+    <merge from="res/xml/pref_headers.xml.ftl"
+             to="${resOut}/xml/pref_headers.xml" />
+    <copy from="res/xml/pref_notification.xml"
+            to="${resOut}/xml/pref_notification.xml" />
 
     <instantiate from="res/values/strings.xml.ftl"
-                   to="res/values/strings_${simpleName}.xml" />
+                   to="${resOut}/values/strings_${simpleName}.xml" />
 
     <instantiate from="src/app_package/SettingsActivity.java.ftl"
                    to="${srcOut}/${activityClass}.java" />