diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
| commit | 9108878992e9825a00c44f0596818d0ab245b183 (patch) | |
| tree | 088b116ca4b1236827337a3d5ae204abc0f907bb /app/src/main/res/layout-sw600dp | |
| parent | 6c1434addf1ee25a8c7ce30c240e2033d5075f35 (diff) | |
| parent | 0365f243fc56112b2f43b35e1b4884d2d1ad2aa4 (diff) | |
Merge branch 'leap_0.9.8' into #8797_certificate_expiration
Diffstat (limited to 'app/src/main/res/layout-sw600dp')
| -rw-r--r-- | app/src/main/res/layout-sw600dp/f_log.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout-sw600dp/log_fragment.xml | 37 |
2 files changed, 1 insertions, 38 deletions
diff --git a/app/src/main/res/layout-sw600dp/f_log.xml b/app/src/main/res/layout-sw600dp/f_log.xml index ec66af07..34daf8be 100644 --- a/app/src/main/res/layout-sw600dp/f_log.xml +++ b/app/src/main/res/layout-sw600dp/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/log_fragment.xml b/app/src/main/res/layout-sw600dp/log_fragment.xml deleted file mode 100644 index 089bfb9d..00000000 --- a/app/src/main/res/layout-sw600dp/log_fragment.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="horizontal" - android:padding="20dp" - tools:context=".LogWindow"> - - - <LinearLayout - android:background="@drawable/white_rect" - android:elevation="1dp" - android:minWidth="300dp" - - android:orientation="vertical" - android:layout_width="400dp" - android:layout_height="match_parent"> - - <include layout="@layout/log_silders"/> - - <include layout="@layout/vpnstatus"/> - </LinearLayout> - - <ListView - android:minWidth="400dp" - android:layout_weight="4" - android:id="@android:id/list" - android:transcriptMode="normal" - android:layout_width="fill_parent" - android:layout_height="match_parent"/> -</LinearLayout> |