2 files changed, 9 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml
index d54327293..7e07ae0f9 100644
--- a/OpenKeychain/src/main/res/values-v21/dimens.xml
+++ b/OpenKeychain/src/main/res/values-v21/dimens.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="statusbar_margin">21dp</dimen>
-    <!-- 120dp + statusbar_margin -->
+    <!--
+        Status bar height according to
+        http://www.google.com/design/spec/layout/structure.html#structure-system-bars
+    -->
+    <dimen name="statusbar_height">24dp</dimen>
+    <!-- 120dp + statusbar_height -->
     <dimen name="big_toolbar">141dp</dimen>
+    <dimen name="huge_toolbar">243dp</dimen>
 </resources>
 \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml
index 93d534873..b47026e5b 100644
--- a/OpenKeychain/src/main/res/values-v21/themes.xml
+++ b/OpenKeychain/src/main/res/values-v21/themes.xml
@@ -4,10 +4,12 @@
     <style name="KeychainTheme" parent="KeychainTheme.Base">
         <item name="android:windowTranslucentStatus">true</item>
 
+        <!-- enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
         <item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
         <item name="android:windowSharedElementExitTransition">@android:transition/move</item>
+
     </style>
 </resources>
 \ No newline at end of file