summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-10-17 16:30:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-17 16:30:00 +0000
commit91d79e820aed570ccd2b1a6b10a7b3cabad99479 (patch)
tree8ebd0d41e95848980b975ab0be313af56a56bb48 /res/values
parentc565c104a6b9f74e68a93108141431d8415881a5 (diff)
parentcee8c66f9a688705f7880f2bffc9d2f95803eb81 (diff)
downloadandroid_packages_apps_Trebuchet-91d79e820aed570ccd2b1a6b10a7b3cabad99479.tar.gz
android_packages_apps_Trebuchet-91d79e820aed570ccd2b1a6b10a7b3cabad99479.tar.bz2
android_packages_apps_Trebuchet-91d79e820aed570ccd2b1a6b10a7b3cabad99479.zip
Merge "Adding ability to list folder items in separate file" into ub-now-queens
Diffstat (limited to 'res/values')
-rw-r--r--res/values/attrs.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 65f8f22a6..b4e154336 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -130,12 +130,14 @@
<attr name="title" format="reference" />
<attr name="uri" format="string" />
</declare-styleable>
+
<declare-styleable name="Extra">
<attr name="key" format="string" />
<attr name="value" format="string" />
</declare-styleable>
<declare-styleable name="Include">
<attr name="workspace" format="reference" />
+ <attr name="folderItems" format="reference" />
</declare-styleable>
<declare-styleable name="PreloadIconDrawable">