summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/activity_logcat.xml26
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/logcat_row.xml8
-rwxr-xr-xorg.fox.ttrss/src/main/res/menu/activity_logcat.xml15
-rwxr-xr-x[-rw-r--r--]org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml0
-rwxr-xr-xorg.fox.ttrss/src/main/res/values/strings.xml3
-rwxr-xr-xorg.fox.ttrss/src/main/res/xml/preferences.xml4
6 files changed, 56 insertions, 0 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/activity_logcat.xml b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml
new file mode 100755
index 00000000..39275c03
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_logcat.xml
@@ -0,0 +1,26 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="?android:colorBackground"
+ android:fitsSystemWindows="true"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
+
+ <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/logcat_swipe_container"
+ android:layout_below="@+id/toolbar"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ListView
+ android:id="@+id/logcat_output"
+ android:scrollbars="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ </android.support.v4.widget.SwipeRefreshLayout>
+
+</RelativeLayout> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/logcat_row.xml b/org.fox.ttrss/src/main/res/layout/logcat_row.xml
new file mode 100755
index 00000000..d751374a
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/logcat_row.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="4sp"
+ android:textSize="12sp"
+ android:gravity="center_vertical"/>
diff --git a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
new file mode 100755
index 00000000..52ee9b26
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+ <item
+ android:id="@+id/logcat_refresh"
+ android:icon="@drawable/ic_refresh"
+ app:showAsAction="ifRoom"
+ android:title="@string/logcat_refresh"/>
+
+ <item
+ android:id="@+id/logcat_copy"
+ android:icon="@drawable/ic_content_copy"
+ app:showAsAction="ifRoom"
+ android:title="@string/logcat_copy"/>
+
+</menu> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml
index 67dbd6d8..67dbd6d8 100644..100755
--- a/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml
+++ b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 89fe997a..c1f235c8 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -260,4 +260,7 @@
<string name="offline_tap_to_switch">Tap to switch offline</string>
<string name="offline_no_articles">No articles downloaded</string>
<string name="prefs_network_settings">More settings...</string>
+ <string name="logcat_refresh">Refresh</string>
+ <string name="logcat_copy">Copy to clipboard</string>
+ <string name="logcat_title">Log viewer</string>
</resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 73f82c0b..bf893468 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -193,6 +193,10 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/debugging" >
+ <Preference
+ android:key="show_logcat"
+ android:title="@string/logcat_title" />
+
<org.fox.ttrss.util.LessBrokenSwitchPreference
android:defaultValue="true"
android:key="webview_hardware_accel"