From fa487386eb4734c4290f3835c24b77e6351a4109 Mon Sep 17 00:00:00 2001
From: Trevor Johns <trevorjohns@google.com>
Date: Fri, 6 Sep 2013 15:53:57 -0700
Subject: Sample templates: Fix @strings/intro_message

Move @strings/intro_message back from "SingleView" template to
"base" template.

Partially reverts changes from commit
bcbb958aeb9ae6248f6f6865dca506be6d1a1bde.

Change-Id: Iffa639a9334e3738ab6fd93985884ea46d43c614
---
 .../SingleView/_MODULE_/src/template/res/values/strings.xml.ftl    | 5 -----
 .../base/_MODULE_/src/template/res/values/base-strings.xml.ftl     | 7 ++++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'common')

diff --git a/common/build/templates/SingleView/_MODULE_/src/template/res/values/strings.xml.ftl b/common/build/templates/SingleView/_MODULE_/src/template/res/values/strings.xml.ftl
index 985dd5c9..0eb34b7d 100755
--- a/common/build/templates/SingleView/_MODULE_/src/template/res/values/strings.xml.ftl
+++ b/common/build/templates/SingleView/_MODULE_/src/template/res/values/strings.xml.ftl
@@ -1,8 +1,3 @@
 <resources>
-    <string name="intro_message">
-        <![CDATA[
-        ${sample.strings.intro}
-        ]]>
-    </string>
     <string name="sample_action">${sample.strings.sample_action}</string>
 </resources>
diff --git a/common/build/templates/base/_MODULE_/src/template/res/values/base-strings.xml.ftl b/common/build/templates/base/_MODULE_/src/template/res/values/base-strings.xml.ftl
index ed596b43..111d279d 100755
--- a/common/build/templates/base/_MODULE_/src/template/res/values/base-strings.xml.ftl
+++ b/common/build/templates/base/_MODULE_/src/template/res/values/base-strings.xml.ftl
@@ -1,3 +1,8 @@
 <resources>
     <string name="app_name">${sample.name}</string>
-</resources>
+    <string name="intro_message">
+        <![CDATA[
+        ${sample.intro}
+        ]]>
+    </string>
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3