diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-06 16:28:34 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-06 16:28:34 +0100 |
| commit | 3d827e7295d37ecb25332b39057338496f6f970d (patch) | |
| tree | f8c5272e125ed9abae72fb3598d25b1c09f06f89 /app/src/main/res/layout-sw600dp-port | |
| parent | 646e2ec7b868920f71c29243d2bbeb13deb811e3 (diff) | |
| parent | edd34192484f4eb618fdcc2a68b18168c155d63c (diff) | |
Merge branch 'origin_0.9.8' into 8823_cw_tablet_layout
Diffstat (limited to 'app/src/main/res/layout-sw600dp-port')
| -rw-r--r-- | app/src/main/res/layout-sw600dp-port/f_log.xml | 29 |
1 files changed, 25 insertions, 4 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 da46450c..4ee64811 100644 --- a/app/src/main/res/layout-sw600dp-port/f_log.xml +++ b/app/src/main/res/layout-sw600dp-port/f_log.xml @@ -5,9 +5,30 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_margin"> + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:padding="@dimen/activity_margin" + android:id="@+id/log_layout"> + + <LinearLayout + android:background="@drawable/white_rect" + android:elevation="1dp" + android:minWidth="300dp" + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="match_parent"> + + <include layout="@layout/log_silders"/> + + <include layout="@layout/vpnstatus"/> + </LinearLayout> + + <ListView + android:id="@android:id/list" + android:transcriptMode="normal" + android:layout_width="fill_parent" + android:layout_height="match_parent"/> </LinearLayout>
\ No newline at end of file |