1 files changed, 67 insertions, 51 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 35818e4ea..dcdd9a31a 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -1,68 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone" />
 
-    <FrameLayout
-        android:id="@+id/import_keys_top_container"
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
+    <LinearLayout
+        android:layout_below="@id/toolbar_include"
+        android:fitsSystemWindows="true"
+        android:layout_marginTop="-25dp"
         android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:orientation="vertical"
-        android:background="@android:color/white" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dip"
-        android:background="?android:attr/listDivider" />
+        <include layout="@layout/notify_area" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dip"
-        android:background="?android:attr/listDivider" />
+        <FrameLayout
+            android:id="@+id/import_keys_top_container"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:orientation="vertical"
+            android:background="@android:color/white" />
 
-    <FrameLayout
-        android:id="@+id/import_keys_list_container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:layout_weight="1"
-        android:background="@android:color/white" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2dip"
+            android:background="?android:attr/listDivider" />
 
-    <LinearLayout
-        android:id="@+id/import_footer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:background="@android:color/white">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="16dp" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dip"
+            android:layout_height="2dip"
             android:background="?android:attr/listDivider" />
 
-        <TextView
-            android:id="@+id/import_import"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+        <FrameLayout
+            android:id="@+id/import_keys_list_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/import_import"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_download"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
-            android:clickable="true"
-            style="@style/SelectableItem" />
+            android:layout_height="0dp"
+            android:orientation="vertical"
+            android:layout_weight="1"
+            android:background="@android:color/white" />
+
+        <LinearLayout
+            android:id="@+id/import_footer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:background="@android:color/white">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:id="@+id/import_import"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/import_import"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:drawableRight="@drawable/ic_action_download"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:clickable="true"
+                style="@style/SelectableItem" />
 
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
-\ No newline at end of file
+</RelativeLayout>
+\ No newline at end of file