aboutsummaryrefslogtreecommitdiffstats
path: root/showcaseview
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-08-26 11:48:06 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-08-26 11:48:11 +0200
commit7f817343aedd19342e851ebb9d1b5a58e176114d (patch)
treeb64a76db53a35d98f6c983d3625498ed2fc5b1e5 /showcaseview
parent28948a80cc8164df2562e88b759738b5aa232e7e (diff)
downloadcgeo-7f817343aedd19342e851ebb9d1b5a58e176114d.zip
cgeo-7f817343aedd19342e851ebb9d1b5a58e176114d.tar.gz
cgeo-7f817343aedd19342e851ebb9d1b5a58e176114d.tar.bz2
Add missing XML namespace information in showcaseview resources
This change has been submitted upstream as https://github.com/amlcurran/ShowcaseView/pull/226
Diffstat (limited to 'showcaseview')
-rw-r--r--showcaseview/res/layout/showcase_button.xml2
-rw-r--r--showcaseview/res/values/styles.xml6
2 files changed, 4 insertions, 4 deletions
diff --git a/showcaseview/res/layout/showcase_button.xml b/showcaseview/res/layout/showcase_button.xml
index 1ce45cd..7abbe85 100644
--- a/showcaseview/res/layout/showcase_button.xml
+++ b/showcaseview/res/layout/showcase_button.xml
@@ -17,5 +17,5 @@
<Button xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ShowcaseButton"
- android:text="@string/ok"
+ android:text="@android:string/ok"
android:id="@id/showcase_button" /> \ No newline at end of file
diff --git a/showcaseview/res/values/styles.xml b/showcaseview/res/values/styles.xml
index 56ea6c4..6f115b9 100644
--- a/showcaseview/res/values/styles.xml
+++ b/showcaseview/res/values/styles.xml
@@ -14,7 +14,7 @@
~ limitations under the License.
-->
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="ShowcaseButton">
<item name="android:layout_width">wrap_content</item>
@@ -30,14 +30,14 @@
<item name="sv_titleTextAppearance">@style/TextAppearance.ShowcaseView.Title</item>
<item name="sv_detailTextAppearance">@style/TextAppearance.ShowcaseView.Detail.Light</item>
<item name="sv_backgroundColor">#3333B5E5</item>
- <item name="sv_buttonText">@string/ok</item>
+ <item name="sv_buttonText">@android:string/ok</item>
</style>
<style name="ShowcaseView">
<item name="sv_titleTextAppearance">@style/TextAppearance.ShowcaseView.Title</item>
<item name="sv_detailTextAppearance">@style/TextAppearance.ShowcaseView.Detail</item>
<item name="sv_backgroundColor">#3333B5E5</item>
- <item name="sv_buttonText">@string/ok</item>
+ <item name="sv_buttonText">@android:string/ok</item>
</style>
<style name="TextAppearance.ShowcaseView.Title" parent="android:style/TextAppearance.Large">