From 3cfb4a0cd6c91c7e6077d17b80089c4332d0fd99 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Sat, 3 May 2014 15:24:19 +0200
Subject: added restart button to openkeychain dialog

---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f4b7d5fa..fa41b7b8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -80,7 +80,7 @@
     <string name="send_unencrypted">Send unencrypted</string>
     <string name="decryption_failed">Decrpytion failed. Maybe you don’t have the proper private key.</string>
     <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Conversations utilizes a third party called <b>OpenKeychain</b> to encrypt and decrypt messages and to mange your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\nTo use openPGP please install the app and then restart Conversations.</string>
+    <string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to mange your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string>
     <string name="restart">Restart</string>
     <string name="install">Install</string>
 </resources>
-- 
cgit v1.2.3


From be2f7e047a488d5ca7de04dfa5437c290882274e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Sat, 3 May 2014 17:06:54 +0200
Subject: more cleanup in res files

---
 res/values/dimens.xml |  7 -------
 res/values/styles.xml | 36 +++++++++---------------------------
 2 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 res/values/dimens.xml

(limited to 'res/values')

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
deleted file mode 100644
index 55c1e590..00000000
--- a/res/values/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-
-</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 20cfcf1d..1468283e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,24 +1,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!--
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Light">
-        <!--
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        -->
-    </style>
-
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
-    </style>
-
-    
-     <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView">
+    <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView">
         <item name="android:drawableBottom">@drawable/section_header</item>
         <item name="android:drawablePadding">4dp</item>
         <item name="android:layout_marginTop">8dp</item>
@@ -27,11 +9,11 @@
         <item name="android:textColor">#5b5b5b</item>
         <item name="android:textStyle">bold</item>
     </style>
-    
-     <style name="Divider">
-    <item name="android:layout_width">match_parent</item>
-    	<item name="android:layout_height">1.5dp</item>
-    	<item name="android:background">#b7b7b7</item>
-	</style>
-	
-</resources>
+
+    <style name="Divider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1.5dp</item>
+        <item name="android:background">#b7b7b7</item>
+    </style>
+
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3