From 38d619dcc524fffdc7efc85a6f09d57a5ce5699a Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 5 Nov 2013 09:21:13 +0100
Subject: [PATCH] Resources in JB workaround refactored

---
 oc_jb_workaround/AndroidManifest.xml                        |   4 ++--
 .../res/drawable-hdpi/{oc_icon.png => main_app_icon.png}    | Bin
 .../{oc_workaround_icon.png => workaround_app_icon.png}     | Bin
 .../res/drawable-ldpi/{oc_icon.png => main_app_icon.png}    | Bin
 .../{oc_workaround_icon.png => workaround_app_icon.png}     | Bin
 .../res/drawable-mdpi/{oc_icon.png => main_app_icon.png}    | Bin
 .../{oc_workaround_icon.png => workaround_app_icon.png}     | Bin
 .../res/drawable-xhdpi/{oc_icon.png => main_app_icon.png}   | Bin
 .../{oc_workaround_icon.png => workaround_app_icon.png}     | Bin
 oc_jb_workaround/res/values/setup.xml                       |   8 ++++++++
 oc_jb_workaround/res/values/strings.xml                     |   7 -------
 oc_jb_workaround/res/xml/authenticator.xml                  |   8 ++++----
 12 files changed, 14 insertions(+), 13 deletions(-)
 rename oc_jb_workaround/res/drawable-hdpi/{oc_icon.png => main_app_icon.png} (100%)
 rename oc_jb_workaround/res/drawable-hdpi/{oc_workaround_icon.png => workaround_app_icon.png} (100%)
 rename oc_jb_workaround/res/drawable-ldpi/{oc_icon.png => main_app_icon.png} (100%)
 rename oc_jb_workaround/res/drawable-ldpi/{oc_workaround_icon.png => workaround_app_icon.png} (100%)
 rename oc_jb_workaround/res/drawable-mdpi/{oc_icon.png => main_app_icon.png} (100%)
 rename oc_jb_workaround/res/drawable-mdpi/{oc_workaround_icon.png => workaround_app_icon.png} (100%)
 rename oc_jb_workaround/res/drawable-xhdpi/{oc_icon.png => main_app_icon.png} (100%)
 rename oc_jb_workaround/res/drawable-xhdpi/{oc_workaround_icon.png => workaround_app_icon.png} (100%)
 create mode 100644 oc_jb_workaround/res/values/setup.xml
 delete mode 100644 oc_jb_workaround/res/values/strings.xml

diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index c987c824..9ae118d9 100644
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/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"
diff --git a/oc_jb_workaround/res/drawable-hdpi/oc_icon.png b/oc_jb_workaround/res/drawable-hdpi/main_app_icon.png
similarity index 100%
rename from oc_jb_workaround/res/drawable-hdpi/oc_icon.png
rename to oc_jb_workaround/res/drawable-hdpi/main_app_icon.png
diff --git a/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-hdpi/workaround_app_icon.png
similarity index 100%
rename from oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png
rename to oc_jb_workaround/res/drawable-hdpi/workaround_app_icon.png
diff --git a/oc_jb_workaround/res/drawable-ldpi/oc_icon.png b/oc_jb_workaround/res/drawable-ldpi/main_app_icon.png
similarity index 100%
rename from oc_jb_workaround/res/drawable-ldpi/oc_icon.png
rename to oc_jb_workaround/res/drawable-ldpi/main_app_icon.png
diff --git a/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-ldpi/workaround_app_icon.png
similarity index 100%
rename from oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png
rename to oc_jb_workaround/res/drawable-ldpi/workaround_app_icon.png
diff --git a/oc_jb_workaround/res/drawable-mdpi/oc_icon.png b/oc_jb_workaround/res/drawable-mdpi/main_app_icon.png
similarity index 100%
rename from oc_jb_workaround/res/drawable-mdpi/oc_icon.png
rename to oc_jb_workaround/res/drawable-mdpi/main_app_icon.png
diff --git a/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-mdpi/workaround_app_icon.png
similarity index 100%
rename from oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png
rename to oc_jb_workaround/res/drawable-mdpi/workaround_app_icon.png
diff --git a/oc_jb_workaround/res/drawable-xhdpi/oc_icon.png b/oc_jb_workaround/res/drawable-xhdpi/main_app_icon.png
similarity index 100%
rename from oc_jb_workaround/res/drawable-xhdpi/oc_icon.png
rename to oc_jb_workaround/res/drawable-xhdpi/main_app_icon.png
diff --git a/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-xhdpi/workaround_app_icon.png
similarity index 100%
rename from oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png
rename to oc_jb_workaround/res/drawable-xhdpi/workaround_app_icon.png
diff --git a/oc_jb_workaround/res/values/setup.xml b/oc_jb_workaround/res/values/setup.xml
new file mode 100644
index 00000000..ed898f55
--- /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
index 1bfdbe02..00000000
--- 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 0bb57600..f1ec8462 100644
--- 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"
-                       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
-- 
2.11.0