| commit | 4de21652d640194c992c0d3f68bd4a02b46b90a8 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Fri Sep 06 23:13:16 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 06 23:13:16 2013 +0000 |
| tree | 8ce47132de4c7b9aa998c281007bd0db65718c7d | |
| parent | 792b4644b96731613d609e6974ff845a242e9f97 [diff] | |
| parent | fa487386eb4734c4290f3835c24b77e6351a4109 [diff] |
Merge "Sample templates: Fix @strings/intro_message" into developers-dev
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 985dd5c..0eb34b7 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 ed596b4..111d279 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