diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-01 17:48:50 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-01 17:48:50 +0100 |
| commit | 0161973d77ead085f99dc64d8a6dfb2ff3d192c0 (patch) | |
| tree | e9f517c5794dac172b7cdaa468259d27a9219bf8 /app/src/main/res/layout-sw600dp-port | |
| parent | 6c9a6fae70ef35d2e04466f4118e1572b38bccfc (diff) | |
| parent | a43778e930041ab26e4d70348553fb98c3f6872d (diff) | |
Merge branch '#8818_tests_for_drawer' into #8832_update_ics-openvpn
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 |