diff options
| author | Trevor Johns <trevorjohns@google.com> | 2013-09-06 15:53:57 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2013-09-06 15:54:47 -0700 |
| commit | fa487386eb4734c4290f3835c24b77e6351a4109 (patch) | |
| tree | f092ac1aa5c44dd484bca341d380abc8a1746439 /common | |
| parent | e12ebe2e9b63d9e4b075e26d785f9211529808df (diff) | |
| download | android-fa487386eb4734c4290f3835c24b77e6351a4109.tar.gz | |
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
Diffstat (limited to 'common')
| -rwxr-xr-x | common/build/templates/SingleView/_MODULE_/src/template/res/values/strings.xml.ftl | 5 | ||||
| -rwxr-xr-x | common/build/templates/base/_MODULE_/src/template/res/values/base-strings.xml.ftl | 7 |
2 files changed, 6 insertions, 6 deletions
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 |