Resources in JB workaround refactored

oc_jb_workaround/AndroidManifest.xml

@@ -10,8 +10,8 @@
 
     <application
         android:allowBackup="false"
-        android:icon="@drawable/oc_workaround_icon"
-        android:label="@string/app_name"
+        android:icon="@drawable/workaround_app_icon"
+        android:label="@string/workaround_app_name"
         android:theme="@style/AppTheme" >
         <service
             android:name=".AccountAuthenticatorService"

oc_jb_workaround/res/values/setup.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="workaround_app_name">ownCloud Jelly Bean Workaround for lost credentials</string>
+    <string name="main_app_name">ownCloud</string>
+    <string name="account_type">owncloud</string>
+    
+</resources>

oc_jb_workaround/res/values/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">ownCloud Jelly Bean Workaround for lost credentials</string>
-    <string name="oc_app_name">ownCloud</string>
-    
-</resources>

oc_jb_workaround/res/xml/authenticator.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-                       android:accountType="owncloud"
-                       android:icon="@drawable/oc_icon"
-                       android:label="@string/oc_app_name"
-                       android:smallIcon="@drawable/oc_icon">  
+                       android:accountType="@string/account_type"
+                       android:icon="@drawable/main_app_icon"
+                       android:label="@string/main_app_name"
+                       android:smallIcon="@drawable/main_app_icon">  
 </account-authenticator>