diff options
| author | Scott Barta <sbarta@google.com> | 2013-04-26 22:54:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-26 22:54:08 +0000 |
| commit | 5fdcd891875c75e33249bb50210eae8cf9a01be0 (patch) | |
| tree | 477b9bcff9eafa3e5bb8d3bb1139c0f9fd2b21aa /templates/activities/SettingsActivity | |
| parent | 31baa1d95b494108670d0033b4724ef78f41ef85 (diff) | |
| parent | 5afb360a339d083d0edc7b78c04f2dcfbd2a7f41 (diff) | |
| download | sdk-5fdcd891875c75e33249bb50210eae8cf9a01be0.zip sdk-5fdcd891875c75e33249bb50210eae8cf9a01be0.tar.gz sdk-5fdcd891875c75e33249bb50210eae8cf9a01be0.tar.bz2 | |
Merge "Modified templates for Gradle projects"
Diffstat (limited to 'templates/activities/SettingsActivity')
| -rw-r--r-- | templates/activities/SettingsActivity/globals.xml.ftl | 3 | ||||
| -rw-r--r-- | templates/activities/SettingsActivity/recipe.xml.ftl | 17 |
2 files changed, 14 insertions, 6 deletions
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" /> |