summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout-sw600dp-port
diff options
context:
space:
mode:
authorfupduck <fupduck@riseup.net>2018-02-16 00:43:45 -0800
committerfupduck <fupduck@riseup.net>2018-02-16 00:43:45 -0800
commit0365f243fc56112b2f43b35e1b4884d2d1ad2aa4 (patch)
treec2b8cb3b8f40d0a96a6167f13a0114aa8dbbdc0c /app/src/main/res/layout-sw600dp-port
parentf6b589d48d99b4458e8977e73433207848373924 (diff)
parent96e5db80d9a949435df32d2d0c46497b86d1fff4 (diff)
Merge branch '#8846_remove_Dashboard' into '0.9.8'
#8846 remove legacy code and files: Dashboard, LogWindow, UserStatusFragment,… See merge request leap/bitmask_android!44
Diffstat (limited to 'app/src/main/res/layout-sw600dp-port')
-rw-r--r--app/src/main/res/layout-sw600dp-port/f_log.xml2
-rw-r--r--app/src/main/res/layout-sw600dp-port/log_fragment.xml45
2 files changed, 1 insertions, 46 deletions
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 4ee64811..78dc4c62 100644
--- a/app/src/main/res/layout-sw600dp-port/f_log.xml
+++ b/app/src/main/res/layout-sw600dp-port/f_log.xml
@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent">
- <include layout="@layout/log_silders"/>
+ <include layout="@layout/f_log_sliders"/>
<include layout="@layout/vpnstatus"/>
</LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp-port/log_fragment.xml b/app/src/main/res/layout-sw600dp-port/log_fragment.xml
deleted file mode 100644
index 7a4b60fe..00000000
--- a/app/src/main/res/layout-sw600dp-port/log_fragment.xml
+++ /dev/null
@@ -1,45 +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"
- 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"/>
-
-</LinearLayout> \ No newline at end of file