From bb0ec7af4f27d356da973d3d612190b0f914fd98 Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Fri, 14 Dec 2012 11:17:51 -0500
Subject: 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
---
 templates/activities/SettingsActivity/recipe.xml.ftl    |  5 ++++-
 .../SettingsActivity/root/res/xml/pref_headers.xml      | 17 -----------------
 .../SettingsActivity/root/res/xml/pref_headers.xml.ftl  | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 templates/activities/SettingsActivity/root/res/xml/pref_headers.xml
 create mode 100644 templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl

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
deleted file mode 100644
index a3da325..0000000
--- a/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- These settings headers are only used on tablets. -->
-
-    <header
-        android:fragment="${packageName}.${activityClass}$GeneralPreferenceFragment"
-        android:title="@string/pref_header_general" />
-
-    <header
-        android:fragment="${packageName}.${activityClass}$NotificationPreferenceFragment"
-        android:title="@string/pref_header_notifications" />
-
-    <header
-        android:fragment="${packageName}.${activityClass}$DataSyncPreferenceFragment"
-        android:title="@string/pref_header_data_sync" />
-
-</preference-headers>
diff --git a/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl b/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl
new file mode 100644
index 0000000..a3da325
--- /dev/null
+++ b/templates/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl
@@ -0,0 +1,17 @@
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- These settings headers are only used on tablets. -->
+
+    <header
+        android:fragment="${packageName}.${activityClass}$GeneralPreferenceFragment"
+        android:title="@string/pref_header_general" />
+
+    <header
+        android:fragment="${packageName}.${activityClass}$NotificationPreferenceFragment"
+        android:title="@string/pref_header_notifications" />
+
+    <header
+        android:fragment="${packageName}.${activityClass}$DataSyncPreferenceFragment"
+        android:title="@string/pref_header_data_sync" />
+
+</preference-headers>
-- 
cgit v1.1