diff options
| author | John Spurlock <jspurlock@google.com> | 2012-12-14 11:17:51 -0500 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-12-14 11:17:51 -0500 |
| commit | bb0ec7af4f27d356da973d3d612190b0f914fd98 (patch) | |
| tree | 80de12a01126954f8140178e1a0c1ad9b3b5a496 | |
| parent | b54896d692dc68decd5cea3c0f8af94fb058c807 (diff) | |
| download | sdk-bb0ec7af4f27d356da973d3d612190b0f914fd98.zip sdk-bb0ec7af4f27d356da973d3d612190b0f914fd98.tar.gz sdk-bb0ec7af4f27d356da973d3d612190b0f914fd98.tar.bz2 | |
Fix SettingActivity ADT template.
pref_headers.xml now goes through variable substitution.
Prior to this fix, the generated activity crashes on tablets.
Change-Id: Iddff16c5f58ae2414620800fb4f1c34e0e4bb9f5
| -rw-r--r-- | templates/activities/SettingsActivity/recipe.xml.ftl | 5 | ||||
| -rw-r--r-- | templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl (renamed from templates/activities/SettingsActivity/root/res/xml/pref_headers.xml) | 0 |
2 files changed, 4 insertions, 1 deletions
diff --git a/templates/activities/SettingsActivity/recipe.xml.ftl b/templates/activities/SettingsActivity/recipe.xml.ftl index bb5b709..e315963 100644 --- a/templates/activities/SettingsActivity/recipe.xml.ftl +++ b/templates/activities/SettingsActivity/recipe.xml.ftl @@ -2,7 +2,10 @@ <recipe> <merge from="AndroidManifest.xml.ftl" /> - <copy from="res/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" /> <instantiate from="res/values/strings.xml.ftl" to="res/values/strings_${simpleName}.xml" /> diff --git a/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml b/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl index a3da325..a3da325 100644 --- a/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml +++ b/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl |