aboutsummaryrefslogtreecommitdiff
path: root/renderScript
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2016-06-16 18:17:33 -0700
committerTrevor Johns <trevorjohns@google.com>2016-06-16 18:27:22 -0700
commitf88a95a9638d8a620cd8e5234b847203ec1eb4b0 (patch)
tree3381a1b231f17b01532cb833959d30b59c4b1a21 /renderScript
parent671a3a0d4c4be1151833ffdbabd130432a2d0b94 (diff)
downloadandroid-f88a95a9638d8a620cd8e5234b847203ec1eb4b0.tar.gz
samples: Remove attrs.xml from RenderScript samples
These attributes were conflicting with the support library, causing compile errors. Change-Id: If2414b4d14285a453e04d5fe9757f8bfe2499184
Diffstat (limited to 'renderScript')
-rw-r--r--renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml14
-rw-r--r--renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml14
2 files changed, 0 insertions, 28 deletions
diff --git a/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml b/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml
deleted file mode 100644
index e67df0a3..00000000
--- a/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
- <!--
- Declare custom theme attributes that allow changing which styles are
- used for button bars depending on the API level.
- ?android:attr/buttonBarStyle is new as of API 11 so this is
- necessary to support previous API levels.
- -->
- <declare-styleable name="ButtonBarContainerTheme">
- <attr name="buttonBarStyle" format="reference" />
- <attr name="buttonBarButtonStyle" format="reference" />
- </declare-styleable>
-
-</resources>
diff --git a/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
deleted file mode 100644
index e67df0a3..00000000
--- a/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
- <!--
- Declare custom theme attributes that allow changing which styles are
- used for button bars depending on the API level.
- ?android:attr/buttonBarStyle is new as of API 11 so this is
- necessary to support previous API levels.
- -->
- <declare-styleable name="ButtonBarContainerTheme">
- <attr name="buttonBarStyle" format="reference" />
- <attr name="buttonBarButtonStyle" format="reference" />
- </declare-styleable>
-
-</resources>