diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-08-26 11:56:03 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-08-26 11:56:36 +0200 |
| commit | ddd56039c368fdb47a49a6dfb29b361ab2b79ab6 (patch) | |
| tree | a648645cce86e5cb5d449ea174ffad9e37042c44 /showcaseview | |
| parent | 41ae891a56181e4685591ba70a867300e04b7cd2 (diff) | |
| parent | f9dc2f3b2c4d9ba13eae8a23dff40aca16fe9873 (diff) | |
| download | cgeo-ddd56039c368fdb47a49a6dfb29b361ab2b79ab6.zip cgeo-ddd56039c368fdb47a49a6dfb29b361ab2b79ab6.tar.gz cgeo-ddd56039c368fdb47a49a6dfb29b361ab2b79ab6.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'showcaseview')
| -rw-r--r-- | showcaseview/res/layout/showcase_button.xml | 2 | ||||
| -rw-r--r-- | showcaseview/res/values/styles.xml | 6 | ||||
| -rw-r--r-- | showcaseview/showcaseview.iml | 21 |
3 files changed, 25 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"> diff --git a/showcaseview/showcaseview.iml b/showcaseview/showcaseview.iml new file mode 100644 index 0000000..e47f7c6 --- /dev/null +++ b/showcaseview/showcaseview.iml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="FacetManager"> + <facet type="android" name="Android"> + <configuration> + <option name="LIBRARY_PROJECT" value="true" /> + <option name="UPDATE_PROPERTY_FILES" value="true" /> + </configuration> + </facet> + </component> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + |