summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-05-23 15:14:34 -0700
committerWinson Chung <winsonc@google.com>2012-05-23 15:39:39 -0700
commit2816ca58d32a8df240609c3107f9770a30ec7bce (patch)
tree454f1d7b1e567b8cddde16e1e49df95d122305b7 /res
parent4712529da82263eb5c104beb66779d233f637ff5 (diff)
downloadandroid_packages_apps_Trebuchet-2816ca58d32a8df240609c3107f9770a30ec7bce.tar.gz
android_packages_apps_Trebuchet-2816ca58d32a8df240609c3107f9770a30ec7bce.tar.bz2
android_packages_apps_Trebuchet-2816ca58d32a8df240609c3107f9770a30ec7bce.zip
Fixing issue with resource ids. (Bug 6532243)
Change-Id: Ie4a245a224038a750e60b0203003638fd561713d
Diffstat (limited to 'res')
-rw-r--r--res/values/attrs.xml6
-rw-r--r--res/values/strings.xml12
-rw-r--r--res/values/styles.xml6
3 files changed, 24 insertions, 0 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 224daac53..c76a6a5c4 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -157,4 +157,10 @@
<attr name="key" format="string" />
<attr name="value" format="string" />
</declare-styleable>
+
+ <!-- Only used in the device overlays -->
+ <declare-styleable name="CustomClingTitleText">
+ </declare-styleable>
+ <declare-styleable name="CustomClingText">
+ </declare-styleable>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1416d40e9..4aee339e4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -260,4 +260,16 @@ s -->
<!-- Folder name format -->
<string name="folder_name_format">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string>
+ <!-- Strings used in device overlays -->
+
+ <!-- Clings -->
+ <!-- Dummy string [CHAR_LIMIT=40] -->
+ <string name="custom_workspace_cling_title_1"></string>
+ <!-- Dummy string [CHAR_LIMIT=60] -->
+ <string name="custom_workspace_cling_description_1"></string>
+ <!-- Dummy string [CHAR_LIMIT=40] -->
+ <string name="custom_workspace_cling_title_2"></string>
+ <!-- Dummy string [CHAR_LIMIT=60] -->
+ <string name="custom_workspace_cling_description_2"></string>
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3d935a164..08c98c9f2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -186,4 +186,10 @@
<item name="android:shadowDy">0.0</item>
<item name="android:shadowRadius">2.0</item>
</style>
+
+ <!-- Overridden in device overlays -->
+ <style name="CustomClingTitleText">
+ </style>
+ <style name="CustomClingText">
+ </style>
</resources>