Merge branch 'schwabe_master' into ssh_new_masternew_master

1 files changed, 15 insertions, 6 deletions

diff --git a/main/src/ui/res/layout/log_window.xml b/main/src/ui/res/layout/log_window.xml
index 7c25dcfa..ffebc474 100644
--- a/main/src/ui/res/layout/log_window.xml
+++ b/main/src/ui/res/layout/log_window.xml
@@ -4,9 +4,18 @@
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:id="@+id/container"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             tools:context=".LogWindow"
-             tools:ignore="MergeRootFrame" />
\ No newline at end of file
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:ignore="MergeRootFrame">
+
+
+    <FrameLayout
+            android:id="@+id/container"
+            tools:context=".LogWindow"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+
+    <include layout="@layout/status_bg" />
+</FrameLayout>
\ No newline at end of file