commit | 2fe60eb2d6eee22757a2354ef392bfde56c64ee6 | [log] [tgz] |
---|---|---|
author | Trevor Johns <trevorjohns@google.com> | Wed Oct 30 20:50:22 2013 -0700 |
committer | Trevor Johns <trevorjohns@google.com> | Wed Oct 30 20:54:40 2013 -0700 |
tree | bca95b5b9e4b0a2b0c8f8c7718337e36e0c517b6 | |
parent | 8f6dcb0156e40cfe10a47033124f26e708ab1ff6 [diff] |
Templates: Make sure resources are unique Resource filenames for styles/dimens XML files need to be unique so that they don't clobber each other when merged during sample output. Change-Id: I6efa868ac8ea9f8bfe2229df48203acd9777c3aa
diff --git a/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/activitycards-dimens.xml similarity index 100% rename from templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml rename to templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/activitycards-dimens.xml
diff --git a/templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml b/templates/ActivityCards/_MODULE_/src/template/res/values/activitycards-styles.xml similarity index 100% rename from templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml rename to templates/ActivityCards/_MODULE_/src/template/res/values/activitycards-styles.xml
diff --git a/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/simpleview-dimens.xml similarity index 100% rename from templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml rename to templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/simpleview-dimens.xml
diff --git a/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/styles.xml b/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/simpleview-styles.xml similarity index 100% rename from templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/styles.xml rename to templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/simpleview-styles.xml
diff --git a/templates/SimpleView/_MODULE_/src/template/res/values/styles.xml b/templates/SimpleView/_MODULE_/src/template/res/values/simpleview-styles.xml similarity index 100% rename from templates/SimpleView/_MODULE_/src/template/res/values/styles.xml rename to templates/SimpleView/_MODULE_/src/template/res/values/simpleview-styles.xml
diff --git a/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/singleview-dimens.xml similarity index 100% rename from templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml rename to templates/SingleView/_MODULE_/src/template/res/values-sw600dp/singleview-dimens.xml
diff --git a/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml b/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/singleview-styles.xml similarity index 100% rename from templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml rename to templates/SingleView/_MODULE_/src/template/res/values-sw600dp/singleview-styles.xml
diff --git a/templates/SingleView/_MODULE_/src/template/res/values/styles.xml b/templates/SingleView/_MODULE_/src/template/res/values/singleview-styles.xml similarity index 100% rename from templates/SingleView/_MODULE_/src/template/res/values/styles.xml rename to templates/SingleView/_MODULE_/src/template/res/values/singleview-styles.xml
diff --git a/templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/templates/base/_MODULE_/src/template/res/values-sw600dp/base-dimens.xml similarity index 100% rename from templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml rename to templates/base/_MODULE_/src/template/res/values-sw600dp/base-dimens.xml
diff --git a/templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml b/templates/base/_MODULE_/src/template/res/values-sw600dp/base-styles.xml similarity index 100% rename from templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml rename to templates/base/_MODULE_/src/template/res/values-sw600dp/base-styles.xml
diff --git a/templates/base/_MODULE_/src/template/res/values/dimens.xml b/templates/base/_MODULE_/src/template/res/values/base-dimens.xml similarity index 100% rename from templates/base/_MODULE_/src/template/res/values/dimens.xml rename to templates/base/_MODULE_/src/template/res/values/base-dimens.xml
diff --git a/templates/base/_MODULE_/src/template/res/values/styles.xml b/templates/base/_MODULE_/src/template/res/values/base-styles.xml similarity index 100% rename from templates/base/_MODULE_/src/template/res/values/styles.xml rename to templates/base/_MODULE_/src/template/res/values/base-styles.xml