summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout-sw600dp
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-02-06 16:28:34 +0100
committercyBerta <cyberta@riseup.net>2018-02-06 16:28:34 +0100
commit3d827e7295d37ecb25332b39057338496f6f970d (patch)
treef8c5272e125ed9abae72fb3598d25b1c09f06f89 /app/src/main/res/layout-sw600dp
parent646e2ec7b868920f71c29243d2bbeb13deb811e3 (diff)
parentedd34192484f4eb618fdcc2a68b18168c155d63c (diff)
Merge branch 'origin_0.9.8' into 8823_cw_tablet_layout
Diffstat (limited to 'app/src/main/res/layout-sw600dp')
-rw-r--r--app/src/main/res/layout-sw600dp/f_log.xml6
-rw-r--r--app/src/main/res/layout-sw600dp/log_fragment.xml5
2 files changed, 7 insertions, 4 deletions
diff --git a/app/src/main/res/layout-sw600dp/f_log.xml b/app/src/main/res/layout-sw600dp/f_log.xml
index 9ad30208..ec66af07 100644
--- a/app/src/main/res/layout-sw600dp/f_log.xml
+++ b/app/src/main/res/layout-sw600dp/f_log.xml
@@ -5,12 +5,12 @@
-->
<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" >
-
+ android:padding="20dp"
+ android:id="@+id/log_layout"
+ >
<LinearLayout
android:background="@drawable/white_rect"
diff --git a/app/src/main/res/layout-sw600dp/log_fragment.xml b/app/src/main/res/layout-sw600dp/log_fragment.xml
index 26f63df4..089bfb9d 100644
--- a/app/src/main/res/layout-sw600dp/log_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/log_fragment.xml
@@ -17,8 +17,9 @@
android:background="@drawable/white_rect"
android:elevation="1dp"
android:minWidth="300dp"
+
android:orientation="vertical"
- android:layout_width="wrap_content"
+ android:layout_width="400dp"
android:layout_height="match_parent">
<include layout="@layout/log_silders"/>
@@ -27,6 +28,8 @@
</LinearLayout>
<ListView
+ android:minWidth="400dp"
+ android:layout_weight="4"
android:id="@android:id/list"
android:transcriptMode="normal"
android:layout_width="fill_parent"