summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2017-12-19 17:37:57 +0100
committerFup Duck <fupduck@sacknagel.com>2017-12-19 17:37:57 +0100
commit4f7200c55032d17c9bdbdb30cfd83dc757c63fe7 (patch)
tree20281c98ed4d32024e43d08034d7ffdf1100f906 /app/src/main/res
parent19a621a29e81929fac065afd36a498645401c345 (diff)
adjust Fragments
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/f_log.xml37
-rw-r--r--app/src/main/res/values/strings.xml3
2 files changed, 38 insertions, 2 deletions
diff --git a/app/src/main/res/layout/f_log.xml b/app/src/main/res/layout/f_log.xml
new file mode 100644
index 00000000..41c72d99
--- /dev/null
+++ b/app/src/main/res/layout/f_log.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2012-2016 Arne Schwabe
+ ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="16dp">
+
+ <LinearLayout
+ android:elevation="1dp"
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" >
+
+ <include layout="@layout/f_log_sliders"/>
+
+ <TextView
+ android:text="@string/speed_waiting"
+ android:singleLine="true"
+ android:id="@+id/speed"
+ tools:ignore="InconsistentLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+
+ <ListView
+ android:id="@android:id/list"
+ android:transcriptMode="normal"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"/>
+
+</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c82fad35..c854948c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,8 +81,7 @@
<string name="title_activity_main">Bitmask</string>
<string name="log_fragment_title">Log</string>
- <string name="title_section2">Section 2</string>
- <string name="title_section3">Section 3</string>
+ <string name="vpn_fragment_title">VPN</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>