Resources in JB workaround refactored

diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index c987c82..9ae118d 100644 (file)
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -10,8 +10,8 @@
 
     <application
         android:allowBackup="false"
 
     <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"
         android:theme="@style/AppTheme" >
         <service
             android:name=".AccountAuthenticatorService"

diff --git a/oc_jb_workaround/res/drawable-hdpi/main_app_icon.png b/oc_jb_workaround/res/drawable-hdpi/main_app_icon.png
new file mode 100644 (file)
index 0000000..e388c7b
Binary files /dev/null and b/oc_jb_workaround/res/drawable-hdpi/main_app_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-hdpi/oc_icon.png b/oc_jb_workaround/res/drawable-hdpi/oc_icon.png
deleted file mode 100644 (file)
index e388c7b..0000000
Binary files a/oc_jb_workaround/res/drawable-hdpi/oc_icon.png and /dev/null differ

diff --git a/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png
deleted file mode 100644 (file)
index 7daeea4..0000000
Binary files a/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png and /dev/null differ

diff --git a/oc_jb_workaround/res/drawable-hdpi/workaround_app_icon.png b/oc_jb_workaround/res/drawable-hdpi/workaround_app_icon.png
new file mode 100644 (file)
index 0000000..7daeea4
Binary files /dev/null and b/oc_jb_workaround/res/drawable-hdpi/workaround_app_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-ldpi/main_app_icon.png b/oc_jb_workaround/res/drawable-ldpi/main_app_icon.png
new file mode 100644 (file)
index 0000000..11cf0ab
Binary files /dev/null and b/oc_jb_workaround/res/drawable-ldpi/main_app_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-ldpi/oc_icon.png b/oc_jb_workaround/res/drawable-ldpi/oc_icon.png
deleted file mode 100644 (file)
index 11cf0ab..0000000
Binary files a/oc_jb_workaround/res/drawable-ldpi/oc_icon.png and /dev/null differ

diff --git a/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png
deleted file mode 100644 (file)
index 8cd92ff..0000000
Binary files a/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png and /dev/null differ

diff --git a/oc_jb_workaround/res/drawable-ldpi/workaround_app_icon.png b/oc_jb_workaround/res/drawable-ldpi/workaround_app_icon.png
new file mode 100644 (file)
index 0000000..8cd92ff
Binary files /dev/null and b/oc_jb_workaround/res/drawable-ldpi/workaround_app_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-mdpi/main_app_icon.png b/oc_jb_workaround/res/drawable-mdpi/main_app_icon.png
new file mode 100644 (file)
index 0000000..6997c7e
Binary files /dev/null and b/oc_jb_workaround/res/drawable-mdpi/main_app_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-mdpi/oc_icon.png b/oc_jb_workaround/res/drawable-mdpi/oc_icon.png
deleted file mode 100644 (file)
index 6997c7e..0000000
Binary files a/oc_jb_workaround/res/drawable-mdpi/oc_icon.png and /dev/null differ

diff --git a/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png
deleted file mode 100644 (file)
index 5bc795a..0000000
Binary files a/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png and /dev/null differ

diff --git a/oc_jb_workaround/res/drawable-mdpi/workaround_app_icon.png b/oc_jb_workaround/res/drawable-mdpi/workaround_app_icon.png
new file mode 100644 (file)
index 0000000..5bc795a
Binary files /dev/null and b/oc_jb_workaround/res/drawable-mdpi/workaround_app_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-xhdpi/main_app_icon.png b/oc_jb_workaround/res/drawable-xhdpi/main_app_icon.png
new file mode 100644 (file)
index 0000000..e388c7b
Binary files /dev/null and b/oc_jb_workaround/res/drawable-xhdpi/main_app_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-xhdpi/oc_icon.png b/oc_jb_workaround/res/drawable-xhdpi/oc_icon.png
deleted file mode 100644 (file)
index e388c7b..0000000
Binary files a/oc_jb_workaround/res/drawable-xhdpi/oc_icon.png and /dev/null differ

diff --git a/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png
deleted file mode 100644 (file)
index 7daeea4..0000000
Binary files a/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png and /dev/null differ

diff --git a/oc_jb_workaround/res/drawable-xhdpi/workaround_app_icon.png b/oc_jb_workaround/res/drawable-xhdpi/workaround_app_icon.png
new file mode 100644 (file)
index 0000000..7daeea4
Binary files /dev/null and b/oc_jb_workaround/res/drawable-xhdpi/workaround_app_icon.png differ

diff --git a/oc_jb_workaround/res/values/setup.xml b/oc_jb_workaround/res/values/setup.xml
new file mode 100644 (file)
index 0000000..ed898f5
--- /dev/null
+++ b/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>
\ No newline at end of file

diff --git a/oc_jb_workaround/res/values/strings.xml b/oc_jb_workaround/res/values/strings.xml
deleted file mode 100644 (file)
index 1bfdbe0..0000000
--- a/oc_jb_workaround/res/values/strings.xml
+++ /dev/null
@@ -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>
\ No newline at end of file

diff --git a/oc_jb_workaround/res/xml/authenticator.xml b/oc_jb_workaround/res/xml/authenticator.xml
index 0bb5760..f1ec846 100644 (file)
--- a/oc_jb_workaround/res/xml/authenticator.xml
+++ b/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"
 <?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>
\ No newline at end of file
 </account-authenticator>
\ No newline at end of file