From d1d34f0bf995f48dac7781711656b8cb8e387707 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 19 Dec 2017 16:08:49 +0100
Subject: move log fragment layout

---
 app/src/main/res/layout-sw600dp-port/f_log.xml | 34 +----------------------
 app/src/main/res/layout-sw600dp/f_log.xml      |  3 +--
 app/src/main/res/layout-v21/f_log.xml          | 37 --------------------------
 app/src/main/res/menu/f_log.xml                |  8 ------
 4 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 app/src/main/res/layout-v21/f_log.xml

(limited to 'app/src/main')

diff --git a/app/src/main/res/layout-sw600dp-port/f_log.xml b/app/src/main/res/layout-sw600dp-port/f_log.xml
index 7a4b60fe..500461b7 100644
--- a/app/src/main/res/layout-sw600dp-port/f_log.xml
+++ b/app/src/main/res/layout-sw600dp-port/f_log.xml
@@ -8,38 +8,6 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:orientation="vertical"
-              tools:context=".LogWindow">
-
-    <LinearLayout
-        android:background="@drawable/white_rect"
-        android:elevation="1dp"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent">
-
-        <include layout="@layout/log_silders"/>
-
-        <Space
-                android:layout_weight="5"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"/>
-        <LinearLayout
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:orientation="vertical">
-            <include layout="@layout/vpnstatus"/>
-        </LinearLayout>
-        <Space
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_weight="1"/>
-    </LinearLayout>
-
-
-    <ListView
-            android:id="@android:id/list"
-            android:transcriptMode="normal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"/>
+              android:orientation="vertical" >
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/f_log.xml b/app/src/main/res/layout-sw600dp/f_log.xml
index 26f63df4..9ad30208 100644
--- a/app/src/main/res/layout-sw600dp/f_log.xml
+++ b/app/src/main/res/layout-sw600dp/f_log.xml
@@ -9,8 +9,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="horizontal"
-              android:padding="20dp"
-              tools:context=".LogWindow">
+              android:padding="20dp" >
 
 
     <LinearLayout
diff --git a/app/src/main/res/layout-v21/f_log.xml b/app/src/main/res/layout-v21/f_log.xml
deleted file mode 100644
index 41c72d99..00000000
--- a/app/src/main/res/layout-v21/f_log.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/menu/f_log.xml b/app/src/main/res/menu/f_log.xml
index 5e0af56c..d30b13cb 100644
--- a/app/src/main/res/menu/f_log.xml
+++ b/app/src/main/res/menu/f_log.xml
@@ -28,12 +28,4 @@
             android:title="@string/send_logfile"
             android:titleCondensed="@string/send"/>
 
-    <item
-            android:id="@+id/edit_vpn"
-            android:alphabeticShortcut="e"
-            android:icon="@drawable/ic_menu_edit"
-            app:showAsAction="withText|ifRoom"
-            android:title="@string/edit_vpn"
-	    android:visible="false"/>
-
 </menu>
-- 
cgit v1.2.3