From d2dc6fa6fc12ca876bb3dcf099ec6694dc7ef061 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 13 Oct 2013 17:07:30 +0200
Subject: Add Seekbar with ticks, make a better layout for large screens of the
 log screen

--HG--
rename : res/layout/logwindow.xml => res/layout-w720dp/logwindow.xml
---
 res/layout/log_silders.xml | 61 ++++++++++++++++++++++++++++++++++++++++++++++
 res/layout/logwindow.xml   | 56 ++----------------------------------------
 2 files changed, 63 insertions(+), 54 deletions(-)
 create mode 100644 res/layout/log_silders.xml

(limited to 'res/layout')

diff --git a/res/layout/log_silders.xml b/res/layout/log_silders.xml
new file mode 100644
index 00000000..9aadd4d1
--- /dev/null
+++ b/res/layout/log_silders.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<LinearLayout
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:id="@+id/logOptionsLayout"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/log_verbosity_level"/>
+
+
+    <de.blinkt.openvpn.fragments.SeekBarTicks
+            android:id="@+id/LogLevelSlider"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            tools:max="5"
+            android:indeterminate="false"/>
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Timestamps"/>
+
+    <RadioGroup
+            android:id="@+id/timeFormatRadioGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <RadioButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="None"
+                android:id="@+id/radioNone"
+                />
+
+        <RadioButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Short"
+                android:id="@+id/radioShort"
+                />
+
+        <RadioButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="ISO"
+                android:id="@+id/radioISO"
+                />
+
+
+    </RadioGroup>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/logwindow.xml b/res/layout/logwindow.xml
index d7281346..d1e467b1 100644
--- a/res/layout/logwindow.xml
+++ b/res/layout/logwindow.xml
@@ -1,63 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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">
 
-    <LinearLayout
-            android:orientation="vertical"
-            android:id="@+id/logOptionsLayout"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/log_verbosity_level"/>
-
-        <SeekBar
-                android:id="@+id/LogLevelSlider"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:max="5"
-                android:indeterminate="false"/>
-
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Timestamps"/>
-
-        <RadioGroup
-                android:id="@+id/timeFormatRadioGroup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-            <RadioButton
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="None"
-                    android:id="@+id/radioNone"
-                    />
-
-            <RadioButton
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Short"
-                    android:id="@+id/radioShort"
-                />
-            <RadioButton
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="ISO"
-                    android:id="@+id/radioISO"
-                    />
-
-
-        </RadioGroup>
-    </LinearLayout>
+    <include layout="@layout/log_silders"/>
 
     <TextView
             android:text="@string/speed_waiting"
-- 
cgit v1.2.3