From df54ee75b4802107ed28019f2284154459b0e6f5 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Tue, 21 Oct 2014 22:53:30 -0400
Subject: Add about dialog with license info

---
 src/main/res/xml/preferences.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/main/res/xml/preferences.xml')

diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 06ab7560..adcde746 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -110,5 +110,12 @@
             android:summary="@string/pref_never_send_crash_summary"
             android:title="@string/pref_never_send_crash" />
     </PreferenceCategory>
+		<eu.siacs.conversations.ui.AboutDialog
+			android:summary="@string/pref_about_conversations_summary"
+			android:title="@string/pref_about_conversations"
+			android:dialogIcon="@drawable/ic_activity"
+			android:negativeButtonText="@null"
+			android:dialogMessage="@string/pref_about_message">
+		</eu.siacs.conversations.ui.AboutDialog>
 
 </PreferenceScreen>
-- 
cgit v1.2.3


From f10dd428bab50a05883a9f7f3d65db085e2e5359 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Tue, 4 Nov 2014 12:08:30 -0500
Subject: Convert about dialog to activity

---
 src/main/res/xml/preferences.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/main/res/xml/preferences.xml')

diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index adcde746..15a61e87 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -110,12 +110,8 @@
             android:summary="@string/pref_never_send_crash_summary"
             android:title="@string/pref_never_send_crash" />
     </PreferenceCategory>
-		<eu.siacs.conversations.ui.AboutDialog
+		<eu.siacs.conversations.ui.AboutPreference
 			android:summary="@string/pref_about_conversations_summary"
-			android:title="@string/pref_about_conversations"
-			android:dialogIcon="@drawable/ic_activity"
-			android:negativeButtonText="@null"
-			android:dialogMessage="@string/pref_about_message">
-		</eu.siacs.conversations.ui.AboutDialog>
+			android:title="@string/title_activity_about" />
 
 </PreferenceScreen>
-- 
cgit v1.2.3