Merge branch 'release' into upstream

6 files changed, 30 insertions, 8 deletions

diff --git a/.idea/modules.xml b/.idea/modules.xml
index fd2a5a2..ac23a1f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -7,8 +7,8 @@
       <module fileurl="file://$PROJECT_DIR$/cgeo-calendar/cgeo-calendar.iml" filepath="$PROJECT_DIR$/cgeo-calendar/cgeo-calendar.iml" />
       <module fileurl="file://$PROJECT_DIR$/cgeo-contacts/cgeo-contacts.iml" filepath="$PROJECT_DIR$/cgeo-contacts/cgeo-contacts.iml" />
       <module fileurl="file://$PROJECT_DIR$/google-play-services_lib/google-play-services_lib.iml" filepath="$PROJECT_DIR$/google-play-services_lib/google-play-services_lib.iml" />
-      <module fileurl="file://$PROJECT_DIR$/google-play-services_lib/google-play-services_lib.iml" filepath="$PROJECT_DIR$/google-play-services_lib/google-play-services_lib.iml" />
       <module fileurl="file://$PROJECT_DIR$/mapswithme-api/mapswithme-api.iml" filepath="$PROJECT_DIR$/mapswithme-api/mapswithme-api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/showcaseview/showcaseview.iml" filepath="$PROJECT_DIR$/showcaseview/showcaseview.iml" />
       <module fileurl="file://$PROJECT_DIR$/tests/tests.iml" filepath="$PROJECT_DIR$/tests/tests.iml" />
     </modules>
   </component>
diff --git a/main/cgeo.iml b/main/cgeo.iml
index 1b98d6a..052ce66 100644
--- a/main/cgeo.iml
+++ b/main/cgeo.iml
@@ -55,6 +55,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="mapswithme-api" exported="" />
+    <orderEntry type="module" module-name="showcaseview" exported="" />
     <orderEntry type="module" module-name="android-support-v7-appcompat" exported="" />
     <orderEntry type="module" module-name="google-play-services_lib" exported="" />
   </component>
diff --git a/main/res/values/showcaseview_styles.xml b/main/res/values/showcaseview_styles.xml
index 864982f..7bbc902 100644
--- a/main/res/values/showcaseview_styles.xml
+++ b/main/res/values/showcaseview_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">#EE223344</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/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>
+