From a835b5b5943030e480ba97982177f7d679229d71 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 16 Feb 2018 17:58:53 +0100
Subject: [PATCH] Revert "fix ViewKeyActivity layout issue"

This reverts commit 70590ad421c0c645e7b5f11fcd76c6594a2c46e1.
---
 .../src/main/res/layout/view_key_activity.xml        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index beac99ee7..7cfaaa30d 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -6,20 +6,21 @@
     android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    >
+    android:fitsSystemWindows="true">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/primary"
+        android:fitsSystemWindows="true"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
         <android.support.design.widget.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
             app:contentScrim="@color/primary"
             app:expandedTitleMarginBottom="102dp"
             app:expandedTitleMarginEnd="128dp"
@@ -30,6 +31,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="238dp"
+                android:fitsSystemWindows="true"
                 app:layout_collapseMode="parallax">
 
                 <FrameLayout
@@ -39,6 +41,7 @@
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="false"
+                    android:fitsSystemWindows="true"
                     android:visibility="gone">
 
                     <ImageView
@@ -46,9 +49,12 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:adjustViewBounds="false"
+                        android:baselineAlignBottom="false"
                         android:cropToPadding="false"
+                        android:fitsSystemWindows="true"
                         android:focusable="false"
-                        android:scaleType="centerCrop" />
+                        android:scaleType="centerCrop"
+                        android:src="@mipmap/ic_launcher" />
 
                     <!-- text protection scrim -->
                     <View