Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

5 files changed, 40 insertions, 0 deletions

diff --git a/src/main/res/layout/activity_logcatoutput.xml b/src/main/res/layout/activity_logcatoutput.xml
new file mode 100644
index 00000000..302991b1
--- /dev/null
+++ b/src/main/res/layout/activity_logcatoutput.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/cplus_copy_to_clipboard"
+        android:id="@+id/actLogOutputCopyButton" />
+
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/actLogInfoOutput"
+        android:scrollbars="vertical"
+        android:textSize="12sp"
+        android:textIsSelectable="true"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/list_item_logcatoutput.xml b/src/main/res/layout/list_item_logcatoutput.xml
new file mode 100644
index 00000000..9a31be17
--- /dev/null
+++ b/src/main/res/layout/list_item_logcatoutput.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/listItemLogcatoutputText"
+        android:scrollbars="vertical"
+        android:textSize="12sp"/>
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 01d15d10..29b2ec88 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -500,4 +500,9 @@
   <string name="cplus_no">Nein</string>
   <string name="cplus_remember_userdecision">Diese Entscheidung merken</string>
   <string name="userdecision_question_resize_picture">Soll das Bild verkleinert werden?</string>
+  <string name="title_activity_loginformation">Logausgaben</string>
+  <string name="cplus_copy_to_clipboard">Kopieren</string>
+  <string name="cplus_copied_to_clipboard">In Zwischenablage kopiert</string>
+  <string name="pref_show_logcat_title">Zeige logcat Ausgabe</string>
+  <string name="pref_show_logcat_summary">Zeigt die Ausgabe von logcat an. Hilfreich für die Fehlersuche.</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 33f89e7a..3bba4c9d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -529,4 +529,10 @@
     <string name="cplus_no">No</string>
     <string name="cplus_remember_userdecision">Remember this decision</string>
     <string name="userdecision_question_resize_picture">Shall the picture be resized?</string>
+    <string name="title_activity_loginformation">Logoutput</string>
+    <string name="cplus_copy_to_clipboard">Copy to clipboard</string>
+    <string name="cplus_copied_to_clipboard">Copied to clipboard</string>
+    <string name="pref_show_logcat_title">Show logcat output</string>
+    <string name="pref_show_logcat_summary">Shows the output of logcat. This is useful for debugging.</string>
+    <string name="cplus_bugreport_jabberid">c+bugs@conference.thedevstack.de</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index e36b3e8b..20ceb634 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -214,6 +214,9 @@
                     android:key="keep_foreground_service"
                     android:title="@string/pref_keep_foreground_service"
                     android:summary="@string/pref_keep_foreground_service_summary" />
+                <de.thedevstack.conversationsplus.ui.preferences.LogInformationPreference
+                    android:summary="@string/pref_show_logcat_summary"
+                    android:title="@string/pref_show_logcat_title"/>
             </PreferenceCategory>
         </PreferenceScreen>