From 5a4fc0a07127155f9c560374e65bf1373979d3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Mar 2015 20:15:09 +0100
Subject: Fix toolbar margins on Android lower 5

---
 OpenKeychain/src/main/res/layout/create_key_activity.xml    | 2 +-
 OpenKeychain/src/main/res/layout/decrypt_files_activity.xml | 2 +-
 OpenKeychain/src/main/res/layout/decrypt_text_activity.xml  | 2 +-
 OpenKeychain/src/main/res/layout/encrypt_files_activity.xml | 2 +-
 OpenKeychain/src/main/res/layout/encrypt_text_activity.xml  | 2 +-
 OpenKeychain/src/main/res/layout/import_keys_activity.xml   | 2 +-
 OpenKeychain/src/main/res/values-large/dimens.xml           | 3 ---
 OpenKeychain/src/main/res/values-v21/dimens.xml             | 1 +
 OpenKeychain/src/main/res/values/dimens.xml                 | 1 +
 9 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/values-large/dimens.xml

diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index b9d5206a1..ecf69e640 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -14,7 +14,7 @@
     <FrameLayout
         android:layout_below="@id/toolbar_include"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
index 06c1dda7b..3cf4a9e7b 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:layout_below="@id/toolbar_include"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
index a692b3681..da4aa7099 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:layout_below="@id/toolbar_include"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index 168e6d0be..f9efd81b4 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -15,7 +15,7 @@
         android:layout_below="@id/toolbar_include"
         android:id="@+id/content_frame"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index fd7fd6672..67f17fa81 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -15,7 +15,7 @@
         android:layout_below="@id/toolbar_include"
         android:id="@+id/content_frame"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index dcdd9a31a..fcc84f50f 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:layout_below="@id/toolbar_include"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/values-large/dimens.xml b/OpenKeychain/src/main/res/values-large/dimens.xml
deleted file mode 100644
index 045e125f3..000000000
--- a/OpenKeychain/src/main/res/values-large/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml
index 7e07ae0f9..f06cbbb80 100644
--- a/OpenKeychain/src/main/res/values-v21/dimens.xml
+++ b/OpenKeychain/src/main/res/values-v21/dimens.xml
@@ -8,4 +8,5 @@
     <!-- 120dp + statusbar_height -->
     <dimen name="big_toolbar">141dp</dimen>
     <dimen name="huge_toolbar">243dp</dimen>
+    <dimen name="minus_statusbar_height">-25dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 434a0a171..2aae06e2e 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -4,4 +4,5 @@
     <dimen name="statusbar_height">0dp</dimen>
     <dimen name="big_toolbar">120dp</dimen>
     <dimen name="huge_toolbar">222dp</dimen>
+    <dimen name="minus_statusbar_height">0dp</dimen>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3